sarj-python-lint 1.63.0__tar.gz → 1.63.1__tar.gz

{sarj_python_lint-1.63.0 → sarj_python_lint-1.63.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: sarj-python-lint
-Version: 1.63.0
+Version: 1.63.1
 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-1.63.0 → sarj_python_lint-1.63.1}/pyproject.toml

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

{sarj_python_lint-1.63.0 → sarj_python_lint-1.63.1}/src/sarj_python_lint/rules/no_fixed_sleep_in_loop.py

@@ -235,7 +235,12 @@ def _folded_seconds(node: ast.expr | None, constants: Mapping[str, float]) -> fl
             return None if value is None else -value
         case ast.BinOp(left=left, op=op, right=right):
             lhs, rhs = _folded_seconds(left, constants), _folded_seconds(right, constants)
-            return None if lhs is None or rhs is None else _arithmetic(op, lhs, rhs)
+            if lhs is None or rhs is None:
+                return None
+            try:
+                return _arithmetic(op, lhs, rhs)
+            except OverflowError:
+                return None
         case _:
             return None
 

{sarj_python_lint-1.63.0 → sarj_python_lint-1.63.1}/src/sarj_python_lint/rules/no_offset_pagination.py

@@ -60,7 +60,7 @@ class NoOffsetPagination(Rule):
         category=RuleCategory.PERFORMANCE,
         autofix=AutofixPolicy.NONE,
         limitations=(
-            "Only SQL string literals in recognized store modules are analyzed.",
+            "Only SQL string literals, f-strings, and their static concatenations in recognized store modules are analyzed.",
             "Only dynamic OFFSET values in credible SELECT queries are reported; fixed ordinal offsets are excluded.",
             "Parenthesized arithmetic and common numeric wrappers such as GREATEST, LEAST, and COALESCE preserve the dynamic driver marker. Arbitrary SQL functions and procedural values remain opaque.",
             "Generated files, migrations, docstrings, comments, quoted identifiers, and BigQuery `WITH OFFSET AS` array indexing are excluded.",
@@ -95,6 +95,36 @@ class NoOffsetPagination(Rule):
                 expected_count=0,
                 public=True,
             ),
+            RuleExample(
+                example_id="concatenated-dynamic-offset",
+                title="Concatenation retains a dynamic offset",
+                outcome=ExampleOutcome.MATCH,
+                files=(
+                    ExampleFile.python(
+                        "app/task_store.py",
+                        "QUERY = 'SELECT id FROM task ORDER BY id ' + f'LIMIT 10 OFFSET {offset}'\n",
+                    ),
+                ),
+                focus_path=PurePosixPath("app/task_store.py"),
+                expected_count=1,
+                scenario="concatenated-sql",
+                public=True,
+            ),
+            RuleExample(
+                example_id="concatenated-static-offset",
+                title="A dynamic limit does not make the offset dynamic",
+                outcome=ExampleOutcome.NO_MATCH,
+                files=(
+                    ExampleFile.python(
+                        "app/task_store.py",
+                        "QUERY = f'SELECT id FROM task LIMIT {limit} ' + 'OFFSET 2'\n",
+                    ),
+                ),
+                focus_path=PurePosixPath("app/task_store.py"),
+                expected_count=0,
+                scenario="concatenated-sql",
+                public=True,
+            ),
         ),
     )
     description = documentation.summary
@@ -168,15 +198,7 @@ def _has_dynamic_numeric_offset(sql: str) -> bool:
 
 
 def _sql_value(node: ast.expr) -> str | None:
-    if isinstance(node, ast.JoinedStr):
-        pieces: list[str] = []
-        for value in node.values:
-            if isinstance(value, ast.Constant) and isinstance(value.value, str):
-                pieces.append(value.value)
-            elif isinstance(value, ast.FormattedValue):
-                pieces.append(":__sarj_dynamic__")
-        return "".join(pieces)
-    return sql_string_value(node)
+    return sql_string_value(node, interpolation_placeholder=":__sarj_dynamic__")
 
 
 def _mask_dialect_noise(sql: str) -> str:

{sarj_python_lint-1.63.0 → sarj_python_lint-1.63.1}/src/sarj_python_lint/rules/no_select_star.py

@@ -15,7 +15,7 @@ from sarj_python_lint.rule_base import (
     RuleDocumentation,
     RuleExample,
 )
-from sarj_python_lint.rules._ast_index import walk, walk as walk_ast
+from sarj_python_lint.rules._ast_index import walk
 from sarj_python_lint.rules._paths import is_test_path
 from sarj_python_lint.rules._sql import sql_string_value, strip_sql_noise
 
@@ -24,7 +24,6 @@ if TYPE_CHECKING:
     from collections.abc import Mapping
 
     from sarj_python_lint._file_context import PythonFileContext
-    from sarj_python_lint.rules._ast_index import NodeIndex
 
 
 _SQL_TOKEN = re.compile(r"[A-Za-z_][A-Za-z0-9_$]*|\d+(?:\.\d+)?|[(),.*;]")
@@ -179,7 +178,7 @@ class NoSelectStar(Rule):
 
         diags: list[Diagnostic] = []
         parents = context.parents
-        docstrings = _docstring_value_ids(tree, node_index=context.node_index)
+        docstrings = context.docstring_node_ids
         consumed: set[int] = set()
         for node in context.nodes(ast.Constant, ast.BinOp, ast.JoinedStr):
             if id(node) in consumed or id(node) in docstrings or not _is_query_context(node, parents):
@@ -210,19 +209,6 @@ class NoSelectStar(Rule):
         return diags
 
 
-def _docstring_value_ids(tree: ast.AST, *, node_index: NodeIndex | None = None) -> set[int]:
-    owners = (ast.Module, ast.ClassDef, ast.FunctionDef, ast.AsyncFunctionDef)
-    return {
-        id(owner.body[0].value)
-        for owner in walk_ast(tree, index=node_index)
-        if isinstance(owner, owners)
-        and owner.body
-        and isinstance(owner.body[0], ast.Expr)
-        and isinstance(owner.body[0].value, ast.Constant)
-        and isinstance(owner.body[0].value.value, str)
-    }
-
-
 def _is_query_context(node: ast.expr, parents: Mapping[ast.AST, ast.AST]) -> bool:
     current: ast.AST = node
     while (parent := parents.get(current)) is not None:

{sarj_python_lint-1.63.0 → sarj_python_lint-1.63.1}/src/sarj_python_lint/rules/prefer_native_string_check.py

@@ -241,14 +241,7 @@ def _plain_string_adapter(
     value = _single_value(node, "type")
     if value is None:
         return False
-    return (
-        isinstance(value, ast.Name)
-        and value.id == "str"
-        and context.imports.builtin_is_unshadowed("str")
-        and _lexical_binding("str", value, provenance) is None
-        and "builtins" not in unsafe_imports
-        and "builtins.str" not in unsafe_imports
-    ) or _resolves(value, context, provenance, imports, unsafe_imports, sources=_BUILTINS, symbol="str")
+    return _builtin_type(value, context, provenance, imports, unsafe_imports, symbol="str")
 
 
 def _single_value(call: ast.Call, keyword: str) -> ast.expr | None:

{sarj_python_lint-1.63.0 → sarj_python_lint-1.63.1}/src/sarj_python_lint/rules/prefer_walrus_regex_match.py

@@ -198,9 +198,15 @@ def _is_candidate_pair(assignment: ast.stmt, condition: ast.stmt) -> bool:
 def _check_body(node: ast.AST, body: list[ast.stmt], context: _AnalysisContext) -> list[Diagnostic]:
     owner = _lexical_owner(node, context.parents)
     state = _body_state(node, owner, body, context)
+    last_uses = {
+        child.id: index
+        for index, statement in enumerate(body)
+        for child in walk(statement)
+        if isinstance(child, ast.Name)
+    }
     diagnostics: list[Diagnostic] = []
     for index in range(len(body) - 1):
-        diagnostic = _diagnostic_for_pair(body, index, state, context)
+        diagnostic = _diagnostic_for_pair(body, index, state, context, last_uses)
         if diagnostic is not None:
             diagnostics.append(diagnostic)
     return diagnostics
@@ -262,6 +268,7 @@ def _diagnostic_for_pair(
     index: int,
     state: _BodyState,
     context: _AnalysisContext,
+    last_uses: Mapping[str, int],
 ) -> Diagnostic | None:
     assignment, condition = body[index], body[index + 1]
     if not (
@@ -282,9 +289,7 @@ def _diagnostic_for_pair(
         annotated_names=state.annotated_names,
     ):
         return None
-    if _is_name_used_after(body, index + 2, name) or is_suppressed(
-        context.source_lines, assignment.lineno, context.code
-    ):
+    if last_uses.get(name, -1) >= index + 2 or is_suppressed(context.source_lines, assignment.lineno, context.code):
         return None
     return Diagnostic(
         path=context.path,
@@ -316,23 +321,6 @@ def _is_regex_call(
     )
 
 
-def _is_name_used_after(stmts: list[ast.stmt], start_idx: int, name: str) -> bool:
-    class UsageVisitor(ast.NodeVisitor):
-        used: bool = False
-
-        def visit_Name(self, node: ast.Name) -> None:
-            if node.id == name:
-                self.used = True
-            self.generic_visit(node)
-
-    visitor = UsageVisitor()
-    for st in stmts[start_idx:]:
-        visitor.visit(st)
-        if visitor.used:
-            return True
-    return False
-
-
 def _environment_before(body: list[ast.stmt], index: int, state: _BodyState) -> _RegexEnvironment:
     prefix = body[:index]
     local_imports = _regex_imports(prefix)

{sarj_python_lint-1.63.0 → sarj_python_lint-1.63.1}/src/sarj_python_lint/rules/prefer_walrus_stream_loop.py

@@ -2,7 +2,6 @@ from __future__ import annotations
 
 import ast
 from pathlib import PurePosixPath
-import re
 from typing import TYPE_CHECKING, ClassVar, Literal, override
 
 from sarj_python_lint.rule_base import (
@@ -24,7 +23,6 @@ if TYPE_CHECKING:
     from sarj_python_lint._file_context import PythonFileContext
 
 
-_LOOP_CANDIDATE_RE = re.compile(r"\bwhile\b[^\n:]*\bTrue\b[^\n:]*:")
 _MIN_BODY_LEN = 3
 _MAX_REWRITE_COLUMNS = 100
 
@@ -123,7 +121,8 @@ class PreferWalrusStreamLoop(Rule):
         path = context.path
         source = context.source
         if (
-            _LOOP_CANDIDATE_RE.search(source) is None
+            "while" not in source
+            or "True" not in source
             or "break" not in source
             or is_test_path(path)
             or context.generated

{sarj_python_lint-1.63.0 → sarj_python_lint-1.63.1}/src/sarj_python_lint/rules/shared_mutable_pydantic_factory.py

@@ -17,7 +17,6 @@ from sarj_python_lint.rule_base import (
     Severity,
     is_suppressed,
 )
-from sarj_python_lint.rules._imports import ImportIndex
 from sarj_python_lint.rules._inert_model_annotation import inert_model_annotation
 
 
@@ -25,6 +24,7 @@ if TYPE_CHECKING:
     from pathlib import Path
 
     from sarj_python_lint._file_context import PythonFileContext
+    from sarj_python_lint.rules._imports import ImportIndex
 
 
 _MODEL_SOURCES = frozenset({"pydantic", "pydantic.main"})
@@ -98,7 +98,7 @@ class SharedMutablePydanticFactory(Rule):
         if "default_factory" not in context.symbol_source or context.generated or context.tree is None:
             return []
         tree = context.tree
-        imports = ImportIndex.from_tree(tree)
+        imports = context.imports
         bindings = _stable_bindings(tree)
         models = {
             model for model in tree.body if isinstance(model, ast.ClassDef) and _unconfigured_model(model, imports)