flowmark 0.5.2__tar.gz → 0.5.3__tar.gz

{flowmark-0.5.2 → flowmark-0.5.3}/.copier-answers.yml

@@ -1,5 +1,5 @@
 # Changes here will be overwritten by Copier. Do not edit manually.
-_commit: v0.2.15
+_commit: v0.2.16
 _src_path: gh:jlevy/simple-modern-uv
 package_author_email: joshua@cal.berkeley.edu
 package_author_name: Joshua Levy

{flowmark-0.5.2 → flowmark-0.5.3}/.github/workflows/ci.yml

@@ -41,7 +41,7 @@ jobs:
         uses: astral-sh/setup-uv@v5
         with:
           # Update this as needed:
-          version: "0.8.0"
+          version: "0.8.4"
           enable-cache: true
           python-version: ${{ matrix.python-version }}
 

{flowmark-0.5.2 → flowmark-0.5.3}/.github/workflows/publish.yml

@@ -21,7 +21,7 @@ jobs:
       - name: Install uv (official Astral action)
         uses: astral-sh/setup-uv@v5
         with:
-          version: "0.8.0"
+          version: "0.8.4"
           enable-cache: true
           python-version: "3.12"
 

{flowmark-0.5.2 → flowmark-0.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: flowmark
-Version: 0.5.2
+Version: 0.5.3
 Summary: Better auto-formatting for Markdown and plaintext
 Project-URL: Repository, https://github.com/jlevy/flowmark
 Author-email: Joshua Levy <joshua@cal.berkeley.edu>

{flowmark-0.5.2 → flowmark-0.5.3}/pyproject.toml

@@ -49,7 +49,7 @@ dev = [
     "ruff>=0.11.9",
     "codespell>=2.4.1",
     "rich>=14.0.0",
-    "basedpyright>=1.29.1",
+    "basedpyright==1.29.5",  # TODO: Upgrade when Cursor supports it.
     "funlog>=0.2.1",
 ]
 

flowmark-0.5.3/src/flowmark/__init__.py

@@ -0,0 +1,34 @@
+__all__ = (
+    "fill_text",
+    "fill_markdown",
+    "first_sentence",
+    "first_sentences",
+    "flowmark_markdown",
+    "html_md_word_splitter",
+    "simple_word_splitter",
+    "line_wrap_by_sentence",
+    "line_wrap_to_width",
+    "reformat_file",
+    "reformat_text",
+    "split_sentences_regex",
+    "wrap_paragraph",
+    "wrap_paragraph_lines",
+    "Wrap",
+)
+
+from flowmark.formats.flowmark_markdown import flowmark_markdown
+from flowmark.linewrapping.line_wrappers import line_wrap_by_sentence, line_wrap_to_width
+from flowmark.linewrapping.markdown_filling import fill_markdown
+from flowmark.linewrapping.sentence_split_regex import (
+    first_sentence,
+    first_sentences,
+    split_sentences_regex,
+)
+from flowmark.linewrapping.text_filling import Wrap, fill_text
+from flowmark.linewrapping.text_wrapping import (
+    html_md_word_splitter,
+    simple_word_splitter,
+    wrap_paragraph,
+    wrap_paragraph_lines,
+)
+from flowmark.reformat_api import reformat_file, reformat_text

flowmark-0.5.2/src/flowmark/custom_marko.py → flowmark-0.5.3/src/flowmark/formats/flowmark_markdown.py

@@ -14,7 +14,7 @@ from marko.parser import Parser
 from marko.source import Source
 from typing_extensions import override
 
-from flowmark.line_wrappers import LineWrapper
+from flowmark.linewrapping.line_wrappers import LineWrapper
 
 
 def _normalize_title_quotes(title: str) -> str:
@@ -327,17 +327,21 @@ class MarkdownNormalizer(Renderer):
         return element.dest
 
 
-def custom_marko(line_wrapper: LineWrapper) -> Markdown:
+def flowmark_markdown(line_wrapper: LineWrapper) -> Markdown:
     """
-    Marko Markdown setup for GFM with minor customizations and a
-    renderer that normalizes Markdown.
+    Marko Markdown setup for GFM with a few customizations for Flowmark and a new
+    renderer that normalizes Markdown according to Flowmark's conventions.
     """
 
     class CustomRenderer(MarkdownNormalizer):
         def __init__(self) -> None:
             super().__init__(line_wrapper)
 
-    class CustomMarkdown(Markdown):
+    class FlowmarkMarkdown(Markdown):
+        """
+        Marko Markdown API with Flowmark customizations.
+        """
+
         def __init__(self) -> None:  # pyright: ignore[reportMissingSuperCall]
             pass
 
@@ -364,4 +368,4 @@ def custom_marko(line_wrapper: LineWrapper) -> Markdown:
 
             self._setup_done: bool = True
 
-    return CustomMarkdown()
+    return FlowmarkMarkdown()

{flowmark-0.5.2/src/flowmark → flowmark-0.5.3/src/flowmark/linewrapping}/line_wrappers.py

@@ -2,9 +2,13 @@ import re
 from collections.abc import Callable
 from typing import Protocol
 
-from flowmark.sentence_split_regex import split_sentences_regex
-from flowmark.text_filling import DEFAULT_WRAP_WIDTH
-from flowmark.text_wrapping import DEFAULT_LEN_FUNCTION, wrap_paragraph, wrap_paragraph_lines
+from flowmark.linewrapping.sentence_split_regex import split_sentences_regex
+from flowmark.linewrapping.text_filling import DEFAULT_WRAP_WIDTH
+from flowmark.linewrapping.text_wrapping import (
+    DEFAULT_LEN_FUNCTION,
+    wrap_paragraph,
+    wrap_paragraph_lines,
+)
 
 DEFAULT_MIN_LINE_LEN = 20
 """Default minimum line length for sentence breaking."""

{flowmark-0.5.2/src/flowmark → flowmark-0.5.3/src/flowmark/linewrapping}/markdown_filling.py

@@ -15,15 +15,19 @@ import re
 from collections.abc import Callable
 from textwrap import dedent
 
-from flowmark.custom_marko import custom_marko
-from flowmark.doc_cleanups import doc_cleanups
-from flowmark.doc_transforms import rewrite_text_content
-from flowmark.ellipses import ellipses as apply_ellipses
-from flowmark.frontmatter import split_frontmatter
-from flowmark.line_wrappers import LineWrapper, line_wrap_by_sentence, line_wrap_to_width
-from flowmark.sentence_split_regex import split_sentences_regex
-from flowmark.smartquotes import smart_quotes
-from flowmark.text_filling import DEFAULT_WRAP_WIDTH
+from flowmark.formats.flowmark_markdown import flowmark_markdown
+from flowmark.formats.frontmatter import split_frontmatter
+from flowmark.linewrapping.line_wrappers import (
+    LineWrapper,
+    line_wrap_by_sentence,
+    line_wrap_to_width,
+)
+from flowmark.linewrapping.sentence_split_regex import split_sentences_regex
+from flowmark.linewrapping.text_filling import DEFAULT_WRAP_WIDTH
+from flowmark.transforms.doc_cleanups import doc_cleanups
+from flowmark.transforms.doc_transforms import rewrite_text_content
+from flowmark.typography.ellipses import ellipses as apply_ellipses
+from flowmark.typography.smartquotes import smart_quotes
 
 
 def _normalize_html_comments(text: str, break_str: str = "\n\n") -> str:
@@ -126,7 +130,7 @@ def fill_markdown(
     markdown_text = _normalize_html_comments(markdown_text)
 
     # Parse and render.
-    marko = custom_marko(line_wrapper)
+    marko = flowmark_markdown(line_wrapper)
     document = marko.parse(markdown_text)
     if cleanups:
         doc_cleanups(document)

{flowmark-0.5.2/src/flowmark → flowmark-0.5.3/src/flowmark/linewrapping}/text_filling.py

@@ -2,7 +2,7 @@ import re
 from collections.abc import Callable
 from enum import Enum
 
-from flowmark.text_wrapping import (
+from flowmark.linewrapping.text_wrapping import (
     DEFAULT_LEN_FUNCTION,
     WordSplitter,
     html_md_word_splitter,

{flowmark-0.5.2 → flowmark-0.5.3}/src/flowmark/reformat_api.py

@@ -3,9 +3,9 @@ from pathlib import Path
 
 from strif import atomic_output_file
 
-from flowmark.markdown_filling import fill_markdown
-from flowmark.text_filling import Wrap, fill_text
-from flowmark.text_wrapping import html_md_word_splitter
+from flowmark.linewrapping.markdown_filling import fill_markdown
+from flowmark.linewrapping.text_filling import Wrap, fill_text
+from flowmark.linewrapping.text_wrapping import html_md_word_splitter
 
 
 def reformat_text(

{flowmark-0.5.2/src/flowmark → flowmark-0.5.3/src/flowmark/transforms}/doc_cleanups.py

@@ -4,7 +4,7 @@ from marko import block, inline
 from marko.block import Document
 from marko.element import Element
 
-from flowmark.doc_transforms import transform_tree
+from flowmark.transforms.doc_transforms import transform_tree
 
 
 def _unbold_heading_transformer(element: Element) -> None:

{flowmark-0.5.2/src/flowmark → flowmark-0.5.3/src/flowmark/transforms}/doc_transforms.py

@@ -45,7 +45,7 @@ def coalesce_raw_text_nodes(doc: Document) -> None:
     This is useful for smart quotes processing which needs to see text that spans
     across line breaks as a single unit.
     """
-    from flowmark.doc_transforms import transform_tree
+    from flowmark.transforms.doc_transforms import transform_tree
 
     def transformer(element: Element) -> None:
         if hasattr(element, "children") and isinstance(element.children, list):  # pyright: ignore

{flowmark-0.5.2 → flowmark-0.5.3}/tests/test_cleanups.py

@@ -1,6 +1,6 @@
-from flowmark.custom_marko import custom_marko
-from flowmark.doc_cleanups import unbold_headings
-from flowmark.line_wrappers import line_wrap_by_sentence
+from flowmark.formats.flowmark_markdown import flowmark_markdown
+from flowmark.linewrapping.line_wrappers import line_wrap_by_sentence
+from flowmark.transforms.doc_cleanups import unbold_headings
 
 input_md = """
 # **Bold Heading 1**
@@ -53,7 +53,7 @@ Final text.
 
 
 def test_unbold_headings() -> None:
-    marko = custom_marko(line_wrap_by_sentence())
+    marko = flowmark_markdown(line_wrap_by_sentence())
 
     doc = marko.parse(input_md)
     unbold_headings(doc)

{flowmark-0.5.2 → flowmark-0.5.3}/tests/test_ellipses.py

@@ -1,4 +1,4 @@
-from flowmark.ellipses import ellipses
+from flowmark.typography.ellipses import ellipses
 
 
 def test_ellipses():

{flowmark-0.5.2 → flowmark-0.5.3}/tests/test_filling.py

@@ -2,7 +2,10 @@ from textwrap import dedent
 
 import marko
 
-from flowmark.markdown_filling import _normalize_html_comments, fill_markdown  # pyright: ignore
+from flowmark.linewrapping.markdown_filling import (
+    _normalize_html_comments,  # pyright: ignore[reportPrivateUsage]
+    fill_markdown,
+)
 
 
 def test_normalize_html_comments():

{flowmark-0.5.2 → flowmark-0.5.3}/tests/test_frontmatter.py

@@ -1,5 +1,5 @@
-from flowmark.frontmatter import has_frontmatter, split_frontmatter
-from flowmark.markdown_filling import fill_markdown
+from flowmark.formats.frontmatter import has_frontmatter, split_frontmatter
+from flowmark.linewrapping.markdown_filling import fill_markdown
 
 
 def test_split_frontmatter():

{flowmark-0.5.2 → flowmark-0.5.3}/tests/test_list_spacing.py

@@ -10,7 +10,7 @@ number of paragraphs in the list item.
 
 from textwrap import dedent
 
-from flowmark.markdown_filling import fill_markdown
+from flowmark.linewrapping.markdown_filling import fill_markdown
 
 
 def test_list_items_with_code_blocks():

{flowmark-0.5.2 → flowmark-0.5.3}/tests/test_ref_docs.py

@@ -1,7 +1,7 @@
 from dataclasses import dataclass
 from pathlib import Path
 
-from flowmark.markdown_filling import fill_markdown
+from flowmark.linewrapping.markdown_filling import fill_markdown
 
 testdoc_dir = Path("tests/testdocs")
 

{flowmark-0.5.2 → flowmark-0.5.3}/tests/test_smartquotes.py

@@ -1,4 +1,4 @@
-from flowmark.smartquotes import smart_quotes
+from flowmark.typography.smartquotes import smart_quotes
 
 
 def test_basic_double_quotes():

{flowmark-0.5.2 → flowmark-0.5.3}/tests/test_wrapping.py

@@ -1,6 +1,6 @@
 from textwrap import dedent
 
-from flowmark.text_wrapping import (
+from flowmark.linewrapping.text_wrapping import (
     _HtmlMdWordSplitter,  # pyright: ignore
     html_md_word_splitter,
     markdown_escape_word,
@@ -224,7 +224,7 @@ def test_wrap_width():
 
 
 def test_line_wrap_to_width_with_markdown_breaks():
-    from flowmark.line_wrappers import line_wrap_to_width
+    from flowmark.linewrapping.line_wrappers import line_wrap_to_width
 
     # Get a markdown-aware line wrapper
     wrapper = line_wrap_to_width(width=80, is_markdown=True)