Update Ruff and use pyright for typechecking

.github/workflows/test.yml

@@ -19,7 +19,7 @@ jobs:
           python-version: ${{ matrix.python-version }}
       - run: pip install uv
       - run: uv venv
-      - run: uv pip install --requirement pyproject.toml --all-extras
+      - run: uv sync
       - run: .venv/bin/pytest --cov=./prosemirror/
       - run: .venv/bin/codecov
         if: matrix.python-version == '3.11'
@@ -33,7 +33,7 @@ jobs:
       - uses: actions/setup-python@v5
       - run: pip install uv
       - run: uv venv
-      - run: uv pip install --requirement pyproject.toml --all-extras
+      - run: uv sync
       - run: .venv/bin/ruff format --check prosemirror tests
       - run: .venv/bin/ruff check prosemirror tests
-      - run: .venv/bin/mypy prosemirror
+      - run: .venv/bin/pyright prosemirror

prosemirror/model/content.py

@@ -1,4 +1,5 @@
 import re
+from dataclasses import dataclass
 from functools import cmp_to_key, reduce
 from typing import (
     TYPE_CHECKING,
@@ -18,23 +19,17 @@
     from .schema import NodeType
 
 
+@dataclass
 class MatchEdge:
     type: "NodeType"
     next: "ContentMatch"
 
-    def __init__(self, type: "NodeType", next: "ContentMatch") -> None:
-        self.type = type
-        self.next = next
-
 
+@dataclass
 class WrapCacheEntry:
     target: "NodeType"
     computed: list["NodeType"] | None
 
-    def __init__(self, target: "NodeType", computed: list["NodeType"] | None) -> None:
-        self.target = target
-        self.computed = computed
-
 
 class Active(TypedDict):
     match: "ContentMatch"
@@ -118,7 +113,7 @@ def fill_before(
         to_end: bool = False,
         start_index: int = 0,
     ) -> Fragment | None:
-        seen = [self]
+        seen: list[ContentMatch] = [self]
 
         def search(match: ContentMatch, types: list["NodeType"]) -> Fragment | None:
             nonlocal seen
@@ -289,7 +284,7 @@ class NameExpr(TypedDict):
 
 
 def parse_expr(stream: TokenStream) -> Expr:
-    exprs = []
+    exprs: list[Expr] = []
     while True:
         exprs.append(parse_expr_seq(stream))
         if not stream.eat("|"):
@@ -300,7 +295,7 @@ def parse_expr(stream: TokenStream) -> Expr:
 
 
 def parse_expr_seq(stream: TokenStream) -> Expr:
-    exprs = []
+    exprs: list[Expr] = []
     while True:
         exprs.append(parse_expr_subscript(stream))
         next_ = stream.next()
@@ -312,7 +307,7 @@ def parse_expr_seq(stream: TokenStream) -> Expr:
 
 
 def parse_expr_subscript(stream: TokenStream) -> Expr:
-    expr = parse_expr_atom(stream)
+    expr: Expr = parse_expr_atom(stream)
     while True:
         if stream.eat("+"):
             expr = {"type": "plus", "expr": expr}

prosemirror/model/fragment.py

@@ -8,7 +8,7 @@
     cast,
 )
 
-from prosemirror.utils import JSON, JSONList, text_length
+from prosemirror.utils import JSON, JSONDict, JSONList, text_length
 
 if TYPE_CHECKING:
     from prosemirror.model.schema import Schema
@@ -89,8 +89,8 @@ def iteratee(
             elif node.is_leaf:
                 if leaf_text:
                     text.append(leaf_text(node) if callable(leaf_text) else leaf_text)
-                elif node.type.spec.get("leafText") is not None:
-                    text.append(node.type.spec["leafText"](node))
+                elif (node_leaf_text := node.type.spec.get("leafText")) is not None:
+                    text.append(node_leaf_text(node))
                 separated = not block_separator
             elif not separated and node.is_block:
                 text.append(block_separator)
@@ -267,7 +267,7 @@ def from_json(cls, schema: "Schema[Any, Any]", value: JSON) -> "Fragment":
             msg = "Invalid input for Fragment.from_json"
             raise ValueError(msg)
 
-        return cls([schema.node_from_json(item) for item in value])
+        return cls([schema.node_from_json(cast(JSONDict, item)) for item in value])
 
     @classmethod
     def from_array(cls, array: list["Node"]) -> "Fragment":