sarj-python-lint 0.87.3__tar.gz → 0.87.5__tar.gz

{sarj_python_lint-0.87.3 → sarj_python_lint-0.87.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: sarj-python-lint
-Version: 0.87.3
+Version: 0.87.5
 Summary: Custom Python lint rules — AST-based, pre-commit-friendly, hypermodern defaults
 Project-URL: Homepage, https://code-standards.sarj.ai/rules/python/
 Project-URL: Documentation, https://code-standards.sarj.ai/rules/python/

{sarj_python_lint-0.87.3 → sarj_python_lint-0.87.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "sarj-python-lint"
-version = "0.87.3"
+version = "0.87.5"
 description = "Custom Python lint rules — AST-based, pre-commit-friendly, hypermodern defaults"
 readme = "README.md"
 authors = [{ name = "sarj-ai" }]

{sarj_python_lint-0.87.3 → sarj_python_lint-0.87.5}/src/sarj_python_lint/__main__.py

@@ -14,6 +14,7 @@ import typer
 from sarj_python_lint import __version__
 from sarj_python_lint._analysis_session import AnalysisSession
 from sarj_python_lint._filesystem import atomic_write_text
+from sarj_python_lint.json_boundary import is_object_mapping, parse_json
 from sarj_python_lint.rule_base import Diagnostic, ProjectRule, Rule, Severity, is_suppressed
 from sarj_python_lint.rules import REGISTRY
 from sarj_python_lint.rules._paths import clear_path_caches
@@ -335,20 +336,14 @@ def _baseline_path(path: Path, *, root: Path | None = None) -> str:
 
 
 def _read_baseline(path: Path) -> dict[str, dict[str, int]]:
-    raw: object = json.loads(  # pyright: ignore[reportAny] — json.loads is an untyped stdlib boundary; the shape is narrowed below
-        path.read_text(encoding="utf-8")
-    )
-    if not isinstance(raw, dict):
+    raw = parse_json(path.read_text(encoding="utf-8"))
+    if not is_object_mapping(raw):
         return {}
     counts: dict[str, dict[str, int]] = {}
-    for file_key, per_code in raw.items():  # pyright: ignore[reportUnknownVariableType] — json.loads yields Any leaves
-        if not isinstance(file_key, str) or not isinstance(per_code, dict):
+    for file_key, per_code in raw.items():
+        if not isinstance(file_key, str) or not is_object_mapping(per_code):
             continue
-        counts[file_key] = {
-            code: n
-            for code, n in per_code.items()  # pyright: ignore[reportUnknownVariableType] — same
-            if isinstance(code, str) and isinstance(n, int)
-        }
+        counts[file_key] = {code: n for code, n in per_code.items() if isinstance(code, str) and isinstance(n, int)}
     return counts
 
 

{sarj_python_lint-0.87.3 → sarj_python_lint-0.87.5}/src/sarj_python_lint/_ratchet_cli.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 from dataclasses import dataclass
-import json
 from pathlib import Path
 import subprocess  # ruff: ignore[suspicious-subprocess-import] -- fixed local Ruff introspection only
 import sys
@@ -11,6 +10,7 @@ import typer
 
 from sarj_python_lint._filesystem import atomic_write_text
 from sarj_python_lint._version import __version__
+from sarj_python_lint.json_boundary import parse_json
 from sarj_python_lint.ratchet import (
     DEFAULT_PER_FILE_CEILING,
     Baseline,
@@ -142,7 +142,7 @@ def _ruff_selector_aliases() -> dict[str, str]:
         encoding="utf-8",
         text=True,
     )
-    raw: object = json.loads(completed.stdout)  # pyright: ignore[reportAny] -- validated below
+    raw = parse_json(completed.stdout)
     if not _is_object_list(raw):
         msg = "Ruff rule catalog was not a JSON list"
         raise TypeError(msg)

sarj_python_lint-0.87.5/src/sarj_python_lint/json_boundary.py

@@ -0,0 +1,10 @@
+import json
+from typing import TypeIs
+
+
+def parse_json(text: str) -> object:
+    return json.loads(text)  # pyright: ignore[reportAny] -- untyped stdlib parser boundary.
+
+
+def is_object_mapping(value: object) -> TypeIs[dict[object, object]]:
+    return isinstance(value, dict)

{sarj_python_lint-0.87.3 → sarj_python_lint-0.87.5}/src/sarj_python_lint/ratchet.py

@@ -9,6 +9,8 @@ import tokenize
 from types import MappingProxyType
 from typing import TYPE_CHECKING, Final, NamedTuple, TypeGuard
 
+from sarj_python_lint.json_boundary import is_object_mapping, parse_json
+
 
 if TYPE_CHECKING:
     from collections.abc import Iterable, Iterator, Mapping
@@ -216,9 +218,7 @@ def seed(measurement: Measurement, baseline: Baseline) -> Baseline:
 
 
 def load_baseline(path: Path) -> Baseline:
-    raw: object = json.loads(  # pyright: ignore[reportAny] — json.loads is an untyped stdlib boundary; every read below narrows
-        path.read_text(encoding="utf-8")
-    )
+    raw = parse_json(path.read_text(encoding="utf-8"))
     schema = _get(raw, "schema_version")
     if schema is not None and schema != BASELINE_SCHEMA_VERSION:
         msg = f"unsupported suppression baseline schema_version: {schema!r}"
@@ -238,9 +238,9 @@ def load_baseline(path: Path) -> Baseline:
 
 
 def _get(mapping: object, key: str) -> object:
-    if not isinstance(mapping, dict):
+    if not is_object_mapping(mapping):
         return None
-    return mapping.get(key)  # pyright: ignore[reportUnknownMemberType, reportUnknownVariableType] — json leaves are Any
+    return mapping.get(key)
 
 
 def dump_baseline(baseline: Baseline, packages: Iterable[str]) -> str:
@@ -308,10 +308,7 @@ def _is_object_list(value: object) -> TypeGuard[list[object]]:
 
 
 def _is_string_object_mapping(value: object) -> TypeGuard[dict[str, object]]:
-    return isinstance(value, dict) and all(
-        isinstance(key, str)
-        for key in value  # pyright: ignore[reportUnknownVariableType] — runtime validation narrows untyped JSON keys.
-    )
+    return is_object_mapping(value) and all(isinstance(key, str) for key in value)
 
 
 def _normalized_subtree(value: str) -> str:

{sarj_python_lint-0.87.3 → sarj_python_lint-0.87.5}/src/sarj_python_lint/rules/_ast_index.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 import ast
-from typing import TYPE_CHECKING, final
+from typing import TYPE_CHECKING, TypeIs, final
 
 
 if TYPE_CHECKING:
@@ -13,12 +13,16 @@ if TYPE_CHECKING:
 _AST = ast.AST
 
 
+def object_list(value: object) -> TypeIs[list[object]]:
+    return isinstance(value, list)
+
+
 def children(node: ast.AST) -> list[ast.AST]:
     out: list[ast.AST] = []
     for name in node._fields:
         value: object = getattr(node, name, None)
-        if isinstance(value, list):
-            out += [item for item in value if isinstance(item, _AST)]  # pyright: ignore[reportUnknownVariableType] — element narrowed by isinstance
+        if object_list(value):
+            out += [item for item in value if isinstance(item, _AST)]
         elif isinstance(value, _AST):
             out.append(value)
     return out
@@ -30,12 +34,7 @@ def walk(node: ast.AST) -> Iterator[ast.AST]:
     while i < len(queue):
         current = queue[i]
         i += 1
-        for name in current._fields:
-            value: object = getattr(current, name, None)
-            if isinstance(value, list):
-                queue += [item for item in value if isinstance(item, _AST)]  # pyright: ignore[reportUnknownVariableType] — element narrowed by isinstance
-            elif isinstance(value, _AST):
-                queue.append(value)
+        queue += children(current)
         yield current
 
 
@@ -56,12 +55,7 @@ class _NodeIndex:
                 buckets[cls] = [current]
             else:
                 bucket.append(current)
-            for name in cls._fields:
-                value: object = getattr(current, name, None)
-                if isinstance(value, list):
-                    flat += [item for item in value if isinstance(item, _AST)]  # pyright: ignore[reportUnknownVariableType] — element narrowed by isinstance
-                elif isinstance(value, _AST):
-                    flat.append(value)
+            flat += children(current)
         self._buckets: dict[type[ast.AST], list[ast.AST]] = buckets
         self._flat: list[ast.AST] = flat
         self._queries: dict[tuple[type[ast.AST], ...], list[ast.AST]] = {}

{sarj_python_lint-0.87.3 → sarj_python_lint-0.87.5}/src/sarj_python_lint/rules/no_whole_request_response_payload_in_log.py

@@ -19,7 +19,7 @@ from sarj_python_lint.rule_base import (
     Severity,
     parse_or_none,
 )
-from sarj_python_lint.rules._ast_index import nodes
+from sarj_python_lint.rules._ast_index import nodes, object_list
 from sarj_python_lint.rules._logging import LOG_METHODS, is_logger_expr
 
 
@@ -308,9 +308,9 @@ def _analysis_facts(tree: ast.Module) -> _AnalysisFacts:
 
 
 def _statement_list(value: object) -> list[ast.stmt] | None:
-    if not isinstance(value, list):
+    if not object_list(value):
         return None
-    ast_items: list[ast.AST] = [item for item in value if isinstance(item, ast.AST)]  # pyright: ignore[reportUnknownVariableType] — narrowed by isinstance
+    ast_items: list[ast.AST] = [item for item in value if isinstance(item, ast.AST)]
     if not ast_items or not all(isinstance(item, ast.stmt) for item in ast_items):
         return None
     return [item for item in ast_items if isinstance(item, ast.stmt)]

{sarj_python_lint-0.87.3 → sarj_python_lint-0.87.5}/src/sarj_python_lint/rules/prefer_walrus_awaited_none_guard.py

@@ -20,6 +20,7 @@ from sarj_python_lint.rule_base import (
     is_suppressed,
     parse_or_none,
 )
+from sarj_python_lint.rules._ast_index import object_list
 from sarj_python_lint.rules._paths import is_generated
 
 
@@ -314,11 +315,11 @@ def _statement_lists(tree: ast.AST) -> list[list[ast.stmt]]:
     result: list[list[ast.stmt]] = []
     for node in ast.walk(tree):
         for field in ("body", "orelse", "finalbody"):
-            value = getattr(node, field, None)
-            if not isinstance(value, list):
+            value: object = getattr(node, field, None)
+            if not object_list(value):
                 continue
             statements: list[ast.stmt] = []
-            for item in value:  # pyright: ignore[reportUnknownVariableType] -- AST fields are untyped lists
+            for item in value:
                 if not isinstance(item, ast.stmt):
                     break
                 statements.append(item)

{sarj_python_lint-0.87.3 → sarj_python_lint-0.87.5}/src/sarj_python_lint/rules/prefer_walrus_regex_match.py

@@ -18,7 +18,7 @@ from sarj_python_lint.rule_base import (
     is_suppressed,
     parse_or_none,
 )
-from sarj_python_lint.rules._ast_index import children, nodes, walk
+from sarj_python_lint.rules._ast_index import children, nodes, object_list, walk
 from sarj_python_lint.rules._paths import is_generated, is_test_path
 
 
@@ -148,10 +148,10 @@ class PreferWalrusRegexMatch(Rule):
         )
 
         for node in walk(tree):
-            raw_body = getattr(node, "body", None)
-            if not isinstance(raw_body, list):
+            raw_body: object = getattr(node, "body", None)
+            if not object_list(raw_body):
                 continue
-            body: list[ast.stmt] = [st for st in raw_body if isinstance(st, ast.stmt)]  # pyright: ignore[reportUnknownVariableType]
+            body: list[ast.stmt] = [st for st in raw_body if isinstance(st, ast.stmt)]
             diags.extend(_check_body(node, body, context))
 
         return sorted(diags, key=lambda d: (d.line, d.col))