rumdl 0.0.51__tar.gz → 0.0.52__tar.gz

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

@@ -1208,7 +1208,7 @@ dependencies = [
 
 [[package]]
 name = "rumdl"
-version = "0.0.51"
+version = "0.0.52"
 dependencies = [
  "anyhow",
  "assert_cmd",
@@ -1236,6 +1236,7 @@ dependencies = [
  "rayon",
  "regex",
  "serde",
+ "serde_json",
  "serde_yaml",
  "strsim",
  "tempfile",
@@ -1475,9 +1476,9 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.21"
+version = "0.8.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900f6c86a685850b1bc9f6223b20125115ee3f31e01207d81655bbcc0aea9231"
+checksum = "05ae329d1f08c4d17a59bed7ff5b5a769d062e64a62d34a3261b219e62cd5aae"
 dependencies = [
  "serde",
  "serde_spanned",
@@ -1496,9 +1497,9 @@ dependencies = [
 
 [[package]]
 name = "toml_edit"
-version = "0.22.25"
+version = "0.22.26"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10558ed0bd2a1562e630926a2d1f0b98c827da99fabd3fe20920a59642504485"
+checksum = "310068873db2c5b3e7659d2cc35d21855dbafa50d1ce336397c666e3cb08137e"
 dependencies = [
  "indexmap",
  "serde",
@@ -1510,9 +1511,9 @@ dependencies = [
 
 [[package]]
 name = "toml_write"
-version = "0.1.0"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28391a4201ba7eb1984cfeb6862c0b3ea2cfe23332298967c749dddc0d6cd976"
+checksum = "bfb942dfe1d8e29a7ee7fcbde5bd2b9a25fb89aa70caea2eba3bee836ff41076"
 
 [[package]]
 name = "trim-in-place"

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

@@ -1,6 +1,6 @@
 [package]
 name = "rumdl"
-version = "0.0.51"
+version = "0.0.52"
 edition = "2021"
 description = "A fast Markdown linter written in Rust (Ru(st) MarkDown Linter)"
 authors = ["Ruben J. Jongejan <ruben.jongejan@gmail.com>"]
@@ -32,6 +32,7 @@ lazy_static = "1.5.0"
 rayon = { version = "1.10.0", optional = true }
 serde = { version = "1.0", features = ["derive"] }
 serde_yaml = "0.9.34"
+serde_json = "1.0"
 toml = "0.8.20"
 walkdir = "2.5.0"
 strsim = "0.11"

{rumdl-0.0.51 → rumdl-0.0.52}/Makefile

@@ -117,4 +117,10 @@ version-push:
 # Combined targets for one-step release
 release-major: version-major version-push
 release-minor: version-minor version-push
-release-patch: version-patch version-push 
+release-patch: version-patch version-push 
+
+maturin-build:
+	uv run --with pip,maturin[zig],cffi maturin build --release
+
+maturin-sdist:
+	uv run --with pip,maturin[zig],cffi maturin sdist

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rumdl
-Version: 0.0.51
+Version: 0.0.52
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers
@@ -17,7 +17,7 @@ Classifier: Programming Language :: Rust
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Software Development :: Quality Assurance
 Classifier: Topic :: Text Processing :: Markup :: Markdown
-Summary: An extremely fast Markdown linter written in Rust
+Summary: A fast Markdown linter written in Rust
 Keywords: markdown,linter,markdown-linter,static-analysis,documentation
 Home-Page: https://github.com/rvben/rumdl
 Author: Ruben J. Jongejan <ruben.jongejan@gmail.com>

{rumdl-0.0.51 → rumdl-0.0.52}/pyproject.toml

@@ -5,7 +5,7 @@ build-backend = "maturin"
 [project]
 name = "rumdl"
 dynamic = ["version"]
-description = "An extremely fast Markdown linter written in Rust"
+description = "A fast Markdown linter written in Rust"
 readme = "README.md"
 requires-python = ">=3.7"
 license = { text = "MIT" }
@@ -60,4 +60,4 @@ disallow_incomplete_defs = true
 [dependency-groups]
 dev = [
     "pre-commit>=2.21.0",
-]
+]

{rumdl-0.0.51 → rumdl-0.0.52}/src/config.rs

@@ -1,19 +1,23 @@
+//!
+//! This module defines configuration structures, loading logic, and provenance tracking for rumdl.
+//! Supports TOML, pyproject.toml, and markdownlint config formats, and provides merging and override logic.
+
 use serde::{Deserialize, Serialize};
-use std::collections::HashMap;
+use std::collections::BTreeMap;
 use std::fs;
 use std::io;
 use std::path::Path;
 
 /// Represents a rule-specific configuration
-#[derive(Debug, Serialize, Deserialize, Default)]
+#[derive(Debug, Serialize, Deserialize, Default, PartialEq)]
 pub struct RuleConfig {
     /// Configuration values for the rule
     #[serde(flatten)]
-    pub values: HashMap<String, toml::Value>,
+    pub values: BTreeMap<String, toml::Value>,
 }
 
 /// Represents the complete configuration loaded from rumdl.toml
-#[derive(Debug, Serialize, Deserialize, Default)]
+#[derive(Debug, Serialize, Deserialize, Default, PartialEq)]
 pub struct Config {
     /// Global configuration options
     #[serde(default)]
@@ -21,11 +25,11 @@ pub struct Config {
 
     /// Rule-specific configurations
     #[serde(flatten)]
-    pub rules: HashMap<String, RuleConfig>,
+    pub rules: BTreeMap<String, RuleConfig>,
 }
 
 /// Global configuration options
-#[derive(Debug, Serialize, Deserialize)]
+#[derive(Debug, Serialize, Deserialize, PartialEq)]
 #[serde(default)]
 pub struct GlobalConfig {
     /// Enabled rules
@@ -66,6 +70,17 @@ impl Default for GlobalConfig {
     }
 }
 
+const MARKDOWNLINT_CONFIG_FILES: &[&str] = &[
+    ".markdownlint.json",
+    ".markdownlint.jsonc",
+    ".markdownlint.yaml",
+    ".markdownlint.yml",
+    "markdownlint.json",
+    "markdownlint.jsonc",
+    "markdownlint.yaml",
+    "markdownlint.yml",
+];
+
 /// Load configuration from the specified file or search for a default config file
 pub fn load_config(config_path: Option<&str>) -> Result<Config, ConfigError> {
     // If a specific config file is provided, use it
@@ -444,6 +459,8 @@ pub enum ConfigSource {
     RumdlToml,
     PyprojectToml,
     Cli,
+    /// Value was loaded from a markdownlint config file (e.g. .markdownlint.json, .markdownlint.yaml)
+    Markdownlint,
 }
 
 #[derive(Debug, Clone)]
@@ -515,13 +532,13 @@ impl Default for SourcedGlobalConfig {
 
 #[derive(Debug, Default)]
 pub struct SourcedRuleConfig {
-    pub values: std::collections::HashMap<String, SourcedValue<toml::Value>>,
+    pub values: BTreeMap<String, SourcedValue<toml::Value>>,
 }
 
 #[derive(Debug, Default)]
 pub struct SourcedConfig {
     pub global: SourcedGlobalConfig,
-    pub rules: std::collections::HashMap<String, SourcedRuleConfig>,
+    pub rules: BTreeMap<String, SourcedRuleConfig>,
     pub loaded_files: Vec<String>,
     pub unknown_keys: Vec<(String, String)>, // (section, key)
 }
@@ -541,8 +558,7 @@ impl SourcedConfig {
             include: SourcedValue::new(Vec::new(), Default),
             respect_gitignore: SourcedValue::new(true, Default),
         };
-        let mut rules: std::collections::HashMap<String, SourcedRuleConfig> =
-            std::collections::HashMap::new();
+        let mut rules: BTreeMap<String, SourcedRuleConfig> = BTreeMap::new();
 
         // Helper to update a sourced value if the new source has higher precedence
         let update_vec = |current: &mut SourcedValue<Vec<String>>,
@@ -564,17 +580,21 @@ impl SourcedConfig {
             match src {
                 ConfigSource::Default => 0,
                 ConfigSource::PyprojectToml => 1,
-                ConfigSource::RumdlToml => 2,
-                ConfigSource::Cli => 3,
+                ConfigSource::Markdownlint => 2,
+                ConfigSource::RumdlToml => 3,
+                ConfigSource::Cli => 4,
             }
         }
 
+        // Track if any TOML/pyproject config was loaded
+        let mut loaded_toml_or_pyproject = false;
         // 1. Load pyproject.toml if present
         if config_path.is_none() && std::path::Path::new("pyproject.toml").exists() {
-            loaded_files.push("pyproject.toml".to_string());
             if let Ok(content) = std::fs::read_to_string("pyproject.toml") {
                 if let Ok(pyproject) = toml::from_str::<toml::Value>(&content) {
                     if let Some(rumdl_config) = pyproject.get("tool").and_then(|t| t.get("rumdl")) {
+                        loaded_files.push("pyproject.toml".to_string());
+                        loaded_toml_or_pyproject = true;
                         if let Some(rumdl_table) = rumdl_config.as_table() {
                             for (key, value) in rumdl_table {
                                 match key.as_str() {
@@ -673,12 +693,12 @@ impl SourcedConfig {
                 }
             }
         }
-
         // 2. Load .rumdl.toml or rumdl.toml if present (higher precedence)
         if config_path.is_none() {
             for filename in [".rumdl.toml", "rumdl.toml"] {
                 if std::path::Path::new(filename).exists() {
                     loaded_files.push(filename.to_string());
+                    loaded_toml_or_pyproject = true;
                     if let Ok(content) = std::fs::read_to_string(filename) {
                         if let Ok(toml_val) = toml::from_str::<toml::Value>(&content) {
                             if let Some(global_table) =
@@ -786,6 +806,7 @@ impl SourcedConfig {
         // 3. If explicit config path is given, load it (highest precedence except CLI)
         if let Some(path) = config_path {
             loaded_files.push(path.to_string());
+            loaded_toml_or_pyproject = true;
             if let Ok(content) = std::fs::read_to_string(path) {
                 if let Ok(toml_val) = toml::from_str::<toml::Value>(&content) {
                     if let Some(global_table) = toml_val.get("global").and_then(|v| v.as_table()) {
@@ -874,7 +895,75 @@ impl SourcedConfig {
                 }
             }
         }
-        // 4. CLI overrides (if provided)
+        // 4. Markdownlint config fallback if no TOML/pyproject config was loaded
+        if !loaded_toml_or_pyproject {
+            for filename in MARKDOWNLINT_CONFIG_FILES {
+                if std::path::Path::new(filename).exists() {
+                    let result = crate::markdownlint_config::load_markdownlint_config(filename);
+                    if let Ok(ml_config) = result {
+                        let sourced = ml_config.map_to_sourced_rumdl_config(Some(filename));
+                        // Merge rule configs
+                        for (rule, rule_cfg) in sourced.rules {
+                            rules.insert(rule, rule_cfg);
+                        }
+                        // Set provenance for global config values to Markdownlint
+                        global.enable = SourcedValue {
+                            value: Vec::new(),
+                            source: ConfigSource::Markdownlint,
+                            overrides: vec![ConfigOverride {
+                                value: Vec::new(),
+                                source: ConfigSource::Markdownlint,
+                                file: Some(filename.to_string()),
+                                line: None,
+                            }],
+                        };
+                        global.disable = SourcedValue {
+                            value: Vec::new(),
+                            source: ConfigSource::Markdownlint,
+                            overrides: vec![ConfigOverride {
+                                value: Vec::new(),
+                                source: ConfigSource::Markdownlint,
+                                file: Some(filename.to_string()),
+                                line: None,
+                            }],
+                        };
+                        global.exclude = SourcedValue {
+                            value: Vec::new(),
+                            source: ConfigSource::Markdownlint,
+                            overrides: vec![ConfigOverride {
+                                value: Vec::new(),
+                                source: ConfigSource::Markdownlint,
+                                file: Some(filename.to_string()),
+                                line: None,
+                            }],
+                        };
+                        global.include = SourcedValue {
+                            value: Vec::new(),
+                            source: ConfigSource::Markdownlint,
+                            overrides: vec![ConfigOverride {
+                                value: Vec::new(),
+                                source: ConfigSource::Markdownlint,
+                                file: Some(filename.to_string()),
+                                line: None,
+                            }],
+                        };
+                        global.respect_gitignore = SourcedValue {
+                            value: true,
+                            source: ConfigSource::Markdownlint,
+                            overrides: vec![ConfigOverride {
+                                value: true,
+                                source: ConfigSource::Markdownlint,
+                                file: Some(filename.to_string()),
+                                line: None,
+                            }],
+                        };
+                        loaded_files.push(filename.to_string());
+                    }
+                    break;
+                }
+            }
+        }
+        // 5. CLI overrides (if provided)
         if let Some(cli) = cli_overrides {
             update_vec(&mut global.enable, cli.enable.value.clone(), Cli, None);
             update_vec(&mut global.disable, cli.disable.value.clone(), Cli, None);
@@ -896,3 +985,24 @@ impl SourcedConfig {
         }
     }
 }
+
+impl From<SourcedConfig> for Config {
+    fn from(sourced: SourcedConfig) -> Self {
+        let global = GlobalConfig {
+            enable: sourced.global.enable.value,
+            disable: sourced.global.disable.value,
+            exclude: sourced.global.exclude.value,
+            include: sourced.global.include.value,
+            respect_gitignore: sourced.global.respect_gitignore.value,
+        };
+        let mut rules = BTreeMap::new();
+        for (rule_name, sourced_rule) in sourced.rules {
+            let mut rule_config = RuleConfig::default();
+            for (k, v) in sourced_rule.values {
+                rule_config.values.insert(k, v.value);
+            }
+            rules.insert(rule_name, rule_config);
+        }
+        Config { global, rules }
+    }
+}

{rumdl-0.0.51 → rumdl-0.0.52}/src/init.rs

@@ -1,3 +1,6 @@
+//!
+//! This module provides initialization utilities for rumdl, such as creating default configuration files.
+
 use std::fs;
 use std::io;
 use std::path::Path;

{rumdl-0.0.51 → rumdl-0.0.52}/src/lib.rs

@@ -4,6 +4,7 @@ pub mod profiling;
 pub mod rule;
 pub mod rules;
 pub mod utils;
+pub mod markdownlint_config;
 
 #[cfg(feature = "python")]
 pub mod python;