blockwatch-cli 0.11.1__tar.gz → 0.11.2__tar.gz

{blockwatch_cli-0.11.1 → blockwatch_cli-0.11.2}/CHANGELOG.md

@@ -12,6 +12,18 @@ Releases up to and including v0.3.11 predate this file. Their notes live on the
 
 ## [Unreleased] - ReleaseDate
 
+## [0.11.2] - 2026-10-15
+
+### Added
+
+- blockwatch now supports Lean (`.lean`), OCaml (`.ml`, `.mli`) and MDX (`.mdx`) files. Before, it skipped them, so
+  their tags were never checked. In MDX, put tags in JavaScript comments, such as `{/* <block> */}`.
+
+### Fixed
+
+- In JSX and TSX, the braces around a `{/* <block> */}` tag are no longer block content. Before, the `}` after a start
+  tag and the `{` before an end tag were part of the block, so e.g. `keep-sorted` reported a correctly sorted list.
+
 ## [0.11.1] - 2026-10-14
 
 ### Added

{blockwatch_cli-0.11.1 → blockwatch_cli-0.11.2}/Cargo.lock

@@ -274,7 +274,7 @@ checksum = "3ded4057c258ba199e2d26386d3af3780957ecaee6c4ef4041c6b4b8b97c0b06"
 
 [[package]]
 name = "blockwatch"
-version = "0.11.1"
+version = "0.11.2"
 dependencies = [
  "anyhow",
  "assert-json-diff",
@@ -289,6 +289,7 @@ dependencies = [
  "heck",
  "ignore",
  "libc",
+ "markdown",
  "mlua",
  "percent-encoding",
  "predicates",
@@ -328,6 +329,7 @@ dependencies = [
  "tree-sitter-make",
  "tree-sitter-md",
  "tree-sitter-nix",
+ "tree-sitter-ocaml",
  "tree-sitter-php",
  "tree-sitter-proto",
  "tree-sitter-python",
@@ -1268,6 +1270,15 @@ dependencies = [
  "which",
 ]
 
+[[package]]
+name = "markdown"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a5cab8f2cadc416a82d2e783a1946388b31654d391d1c7d92cc1f03e295b1deb"
+dependencies = [
+ "unicode-id",
+]
+
 [[package]]
 name = "matchit"
 version = "0.8.4"
@@ -2646,6 +2657,16 @@ dependencies = [
  "tree-sitter-language",
 ]
 
+[[package]]
+name = "tree-sitter-ocaml"
+version = "0.26.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43adb10fcccbcbbce0f4adc9dab7cd55f0a5eafc2d71bd4c03fcc5d6767066e0"
+dependencies = [
+ "cc",
+ "tree-sitter-language",
+]
+
 [[package]]
 name = "tree-sitter-php"
 version = "0.25.1"
@@ -2788,6 +2809,12 @@ version = "2.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dbc4bc3a9f746d862c45cb89d705aa10f187bb96c76001afab07a0d35ce60142"
 
+[[package]]
+name = "unicode-id"
+version = "0.3.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65dd75ab2d9d379dbe86d4059e91d8b5a6e7054865eaba1ddbfc7a817ff96392"
+
 [[package]]
 name = "unicode-ident"
 version = "1.0.24"

{blockwatch_cli-0.11.1 → blockwatch_cli-0.11.2}/Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "blockwatch"
 # <block name="crate-version" same-as="docs/cli.md:sarif-example" same-as-mode="subset" same-as-pattern='version = "(?P<value>\d+\.\d+\.\d+)"'>
-version = "0.11.1"
+version = "0.11.2"
 # </block>
 edition = "2024"
 repository = "https://github.com/mennanov/blockwatch"
@@ -27,6 +27,7 @@ fnv = "1.0"
 globset = "0.4.18"
 heck = "0.5"
 ignore = "0.4"
+markdown = "1.0.0"
 mlua = { version = "0.12.0", features = ["lua54", "vendored", "async", "send"] }
 percent-encoding = "2.3"
 regex = "1.12"
@@ -66,6 +67,7 @@ tree-sitter-lua = "0.5"
 tree-sitter-make = "1.1"
 tree-sitter-md = "0.5"
 tree-sitter-nix = "0.3.0"
+tree-sitter-ocaml = "0.26"
 tree-sitter-php = "0.25"
 tree-sitter-proto = "0.6.0"
 tree-sitter-python = "0.25"

{blockwatch_cli-0.11.1 → blockwatch_cli-0.11.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: blockwatch-cli
-Version: 0.11.1
+Version: 0.11.2
 Summary: Language agnostic linter that keeps your code and documentation in sync and valid
 Keywords: linter,sync,drift,comments,agents
 Home-Page: https://github.com/mennanov/blockwatch

{blockwatch_cli-0.11.1 → blockwatch_cli-0.11.2}/README.md

@@ -10,7 +10,7 @@ Some parts of a codebase have to change together: a function and its docs, or a
 blockwatch lets you write those rules in comments, right next to the code. If they fall out of sync, your pre-commit
 hook or CI run fails.
 
-Supports [34 languages](#supported-languages) and their common file names, such as `Gemfile` or `.mjs`.
+Supports [37 languages](#supported-languages) and their common file names, such as `Gemfile` or `.mjs`.
 
 [//]: # (</block>)
 
@@ -215,7 +215,7 @@ exclusions, and custom extension mappings.
 
 ```yaml
 - repo: https://github.com/mennanov/blockwatch
-  rev: v0.11.1  # Use latest release
+  rev: v0.11.2  # Use latest release
   hooks:
     - id: blockwatch
 ```
@@ -259,10 +259,13 @@ For plain git hooks, local pre-commit setups, and sandboxing untrusted Lua scrip
 - Java
 - JavaScript (with `.mjs` and `.cjs` support)
 - Kotlin
+- Lean
 - Lua (with `.rockspec` support)
+- MDX
 - Makefile (with `GNUmakefile` and `.mak` support)
 - Markdown
 - Nix
+- OCaml (`.ml`, `.mli`)
 - PHP
 - Protocol Buffers (`.proto`)
 - Python (with `.pyi` and `.pyw` support)

{blockwatch_cli-0.11.1 → blockwatch_cli-0.11.2}/docs/ci.md

@@ -20,7 +20,7 @@ To use [pre-commit](https://pre-commit.com), add the hook to `.pre-commit-config
 
 ```yaml
 - repo: https://github.com/mennanov/blockwatch
-  rev: v0.11.1  # Use latest release
+  rev: v0.11.2  # Use latest release
   hooks:
     - id: blockwatch
 ```
@@ -61,7 +61,7 @@ The `blockwatch` hook runs before the commit message exists, so it cannot see a
 
 ```yaml
 - repo: https://github.com/mennanov/blockwatch
-  rev: v0.11.1  # Use latest release
+  rev: v0.11.2  # Use latest release
   hooks:
     - id: blockwatch-commit-msg
 ```

{blockwatch_cli-0.11.1 → blockwatch_cli-0.11.2}/docs/cli.md

@@ -546,15 +546,15 @@ Nothing else about the run changes: the same violations are found, and the exit
       "tool": {
         "driver": {
           "name": "blockwatch",
-          "version": "0.11.1",
-          "semanticVersion": "0.11.1",
+          "version": "0.11.2",
+          "semanticVersion": "0.11.2",
           "informationUri": "https://github.com/mennanov/blockwatch",
           "rules": [
             {
               "id": "keep-sorted",
               "name": "keep-sorted",
               "shortDescription": { "text": "Requires the lines of a block to stay in order." },
-              "helpUri": "https://github.com/mennanov/blockwatch/blob/v0.11.1/docs/validators/keep-sorted.md"
+              "helpUri": "https://github.com/mennanov/blockwatch/blob/v0.11.2/docs/validators/keep-sorted.md"
             }
           ]
         }

{blockwatch_cli-0.11.1 → blockwatch_cli-0.11.2}/setup.py

@@ -6,7 +6,7 @@ setup(
     name='blockwatch-pre-commit-placeholder',
     version='0.0.0',
     # <block same-as="Cargo.toml:crate-version" same-as-pattern="blockwatch-cli==(?P<value>\d+\.\d+\.\d+)">
-    install_requires=['blockwatch-cli==0.11.1'],
+    install_requires=['blockwatch-cli==0.11.2'],
     # </block>
     # Without it, setuptools takes the directories under src/ for Python packages.
     packages=[],

{blockwatch_cli-0.11.1 → blockwatch_cli-0.11.2}/src/block_parser.rs

@@ -32,7 +32,7 @@ impl<C: CommentsParser> BlocksFromCommentsParser<C> {
 }
 
 /// Assembles [`Block`]s out of a comment stream.
-struct BlocksIterator<'source, I: Iterator<Item = Comment>> {
+pub(crate) struct BlocksIterator<'source, I: Iterator<Item = Comment>> {
     partial_blocks: PartialBlocksIterator<'source, I>,
     /// Start tags still waiting for their end tag, outermost first.
     open_blocks: Vec<BlockStart>,
@@ -46,7 +46,7 @@ struct BlocksIterator<'source, I: Iterator<Item = Comment>> {
 
 impl<'source, I: Iterator<Item = Comment>> BlocksIterator<'source, I> {
     /// Starts the block stream over the comments of `contents`, which must be in source order.
-    fn new(comments: I, contents: &'source str) -> Self {
+    pub(crate) fn new(comments: I, contents: &'source str) -> Self {
         Self {
             partial_blocks: PartialBlocksIterator::new(comments, contents),
             open_blocks: Vec::new(),

{blockwatch_cli-0.11.1 → blockwatch_cli-0.11.2}/src/blocks.rs

@@ -2982,6 +2982,10 @@ mod supported_languages_tests {
                 "kts.kts".to_string(),
                 "// <block>\nplugins { }\n// </block>".to_string(),
             ),
+            (
+                "lean.lean".to_string(),
+                "-- <block>\ndef x := 1\n-- </block>".to_string(),
+            ),
             (
                 "lua.lua".to_string(),
                 "-- <block>\nlocal x = 1\n-- </block>".to_string(),
@@ -3006,6 +3010,10 @@ mod supported_languages_tests {
                 "md.md".to_string(),
                 "<div>\n<!-- <block> -->\n## Heading\n<!-- </block> -->\n</div>".to_string(),
             ),
+            (
+                "mdx.mdx".to_string(),
+                "{/* <block> */}\n## Heading\n{/* </block> */}".to_string(),
+            ),
             (
                 "mk.mk".to_string(),
                 "# <block>\nall:\n\t@echo \"hello\"\n# </block>".to_string(),
@@ -3022,6 +3030,14 @@ mod supported_languages_tests {
                 "nix.nix".to_string(),
                 "# <block>\n{ pkgs = null; }\n# </block>".to_string(),
             ),
+            (
+                "ml.ml".to_string(),
+                "(* <block> *)\nlet x = 1\n(* </block> *)".to_string(),
+            ),
+            (
+                "mli.mli".to_string(),
+                "(* <block> *)\nval x : int\n(* </block> *)".to_string(),
+            ),
             (
                 "php.php".to_string(),
                 "<?php\n# <block>\necho 'hello';\n# </block>\n?>".to_string(),

{blockwatch_cli-0.11.1 → blockwatch_cli-0.11.2}/src/language_parsers/javascript.rs

@@ -100,4 +100,50 @@ let between = 2;
 
         Ok(())
     }
+
+    #[test]
+    fn jsx_expression_holding_only_a_comment_covers_its_braces() -> anyhow::Result<()> {
+        let mut comments_parser = comments_parser()?;
+
+        let comments: Vec<Comment> = comments_parser
+            .parse(
+                r#"const list = (
+  <ul>
+    {/* lone */}
+    {/* with code */ items}
+    { /* first */ /* second */ }
+  </ul>
+);
+"#,
+            )
+            .collect();
+
+        assert_eq!(
+            comments,
+            vec![
+                Comment {
+                    position_range: Position::new(3, 5)..Position::new(3, 17),
+                    source_range: 26..38,
+                    comment_text: "    lone    ".to_string()
+                },
+                Comment {
+                    position_range: Position::new(4, 6)..Position::new(4, 21),
+                    source_range: 44..59,
+                    comment_text: "   with code   ".to_string()
+                },
+                Comment {
+                    position_range: Position::new(5, 7)..Position::new(5, 18),
+                    source_range: 73..84,
+                    comment_text: "   first   ".to_string()
+                },
+                Comment {
+                    position_range: Position::new(5, 19)..Position::new(5, 31),
+                    source_range: 85..97,
+                    comment_text: "   second   ".to_string()
+                },
+            ]
+        );
+
+        Ok(())
+    }
 }