sarj-python-lint 1.72.1__tar.gz → 1.74.1__tar.gz

{sarj_python_lint-1.72.1 → sarj_python_lint-1.74.1}/PKG-INFO

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

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

{sarj_python_lint-1.72.1 → sarj_python_lint-1.74.1}/src/sarj_python_lint/rules/_local_alias_fix.py

@@ -16,6 +16,7 @@ if TYPE_CHECKING:
     from sarj_python_lint._file_context import PythonFileContext
 
 
+_ALIAS_RETURN_LENGTH = 2
 _NAMESPACE_MUTATORS = frozenset(
     {
         "setattr",
@@ -86,9 +87,9 @@ class LocalAliasFixes:
         if not isinstance(source, ast.Name) or parameters[0].arg != source.id:
             return ()
         body = owner.body[1:] if ast.get_docstring(owner) is not None else owner.body
-        if body[:1] != [assignment] or len(body[1:]) != 1 or not isinstance(body[-1], ast.Return):
+        if len(body) != _ALIAS_RETURN_LENGTH or body[0] is not assignment or not isinstance(body[1], ast.Return):
             return ()
-        call = body[-1].value
+        call = body[1].value
         if not isinstance(call, ast.Call) or not isinstance(call.func, ast.Name) or call.func.id != "dict":
             return ()
         if call.args or len(call.keywords) != 1 or call.keywords[0].value is not use or not self._available:
@@ -110,14 +111,8 @@ class LocalAliasFixes:
             return ()
         if assignment.end_lineno != assignment.lineno:
             return ()
-        line = self.context.source_lines[assignment.lineno - 1]
         raw = self._lines[assignment.lineno - 1]
-        if (
-            raw[: assignment.col_offset].strip()
-            or raw[assignment.end_col_offset :].strip()
-            or ";" in line
-            or "\\" in line
-        ):
+        if raw[: assignment.col_offset].strip() or raw[assignment.end_col_offset :].strip():
             return ()
         return (
             TextEdit(assignment.lineno, 1, assignment.lineno + 1, 1, ""),

{sarj_python_lint-1.72.1 → sarj_python_lint-1.74.1}/src/sarj_python_lint/rules/_resource_provenance.py

@@ -428,7 +428,7 @@ class ResourceProvenance:
             name = binding.id if isinstance(binding, ast.Name) else binding.name
             if name in self.mutated or name in self.external_bindings:
                 return False
-            for read in self._binding_reads(name, binding):
+            for read in self.binding_reads(name, binding):
                 alias = self._function_alias(read)
                 if alias is not None:
                     pending.append(alias)
@@ -469,7 +469,7 @@ class ResourceProvenance:
             and any(self.imported(constructor.func, f"contextlib.{kind}") for kind in ("ExitStack", "AsyncExitStack"))
         )
 
-    def _binding_reads(self, name: str, binding: ast.AST) -> list[ast.Name]:
+    def binding_reads(self, name: str, binding: ast.AST) -> list[ast.Name]:
         return self._indexed_reads(name, binding, cache=self._reads_by_binding, resolve=self.binding)
 
     def _indexed_reads(
@@ -496,7 +496,7 @@ class ResourceProvenance:
         if key not in self.escape_cache:
             self.escape_cache[key] = all(
                 self._method_or_context_read(read, allow_context=allow_context)
-                for read in self._binding_reads(name.id, binding)
+                for read in self.binding_reads(name.id, binding)
             )
         return self.escape_cache[key]
 

{sarj_python_lint-1.72.1 → sarj_python_lint-1.74.1}/src/sarj_python_lint/rules/no_redundant_local_alias.py

@@ -1,7 +1,6 @@
 from __future__ import annotations
 
 import ast
-from collections import defaultdict
 from pathlib import PurePosixPath
 import re
 from typing import TYPE_CHECKING, ClassVar, final, override
@@ -24,7 +23,7 @@ from sarj_python_lint.rules._suppression_comments import comment_lines
 
 
 if TYPE_CHECKING:
-    from collections.abc import Mapping
+    from collections.abc import Iterator, Mapping
 
     from sarj_python_lint._file_context import PythonFileContext
     from sarj_python_lint.rules._resource_provenance import ResourceProvenance
@@ -32,7 +31,7 @@ if TYPE_CHECKING:
 
 _FUNCTIONS = (ast.FunctionDef, ast.AsyncFunctionDef)
 _SUITES = (*_FUNCTIONS, ast.With, ast.AsyncWith)
-_UNCERTAIN = (
+_NESTED_SCOPES = (
     *_FUNCTIONS,
     ast.ClassDef,
     ast.Lambda,
@@ -40,6 +39,9 @@ _UNCERTAIN = (
     ast.SetComp,
     ast.DictComp,
     ast.GeneratorExp,
+)
+_UNCERTAIN = (
+    *_NESTED_SCOPES,
     ast.If,
     ast.For,
     ast.AsyncFor,
@@ -89,7 +91,8 @@ class NoRedundantLocalAlias(Rule):
         limitations=(
             "Only unannotated, single-target `alias = original` assignments with one binding and one read at `alias=alias` are checked.",
             "The original must be a parameter or an earlier initialized local with one binding; reassignment, deletion, imports, alias chains and uncertain initialization are excluded.",
-            "Functions with if statements, loops, try statements, asserts, Boolean short-circuiting, nested scopes, global/nonlocal declarations or type aliases are excluded. Ordinary and async with bodies require ordered enclosing-suite binding evidence.",
+            "Completed function-body if prefixes and their Boolean tests are supported only before a fresh, uniquely initialized local and alias in that same body. Parameters, earlier source bindings and aliases nested in with bodies after such prefixes are excluded.",
+            "Loops, try statements, asserts, other Boolean short-circuiting, nested scopes, global/nonlocal declarations and type aliases are excluded. Ordinary and async with bodies require ordered enclosing-suite binding evidence.",
             "A conditional expression is admitted only when its test is a bare name bound once as a parameter, and neither local is read within the expression.",
             "Typed aliases, files with type comments, same-scope quoted references and conditional reads of either local are excluded. Captured bindings and module/class aliases are preserved.",
             "Files with wildcard imports, Pydantic imports or references to known namespace readers, dynamic attribute getters or reference-count observers are excluded. Wildcard exports cannot establish builtin identity; computed type names can consume caller-local bindings without a Name read in the AST.",
@@ -145,6 +148,36 @@ class NoRedundantLocalAlias(Rule):
                 expected_count=0,
                 public=True,
             ),
+            RuleExample(
+                example_id="completed-guard-prefix",
+                scenario="completed-guard",
+                title="Initialize the original after the completed guard",
+                outcome=ExampleOutcome.MATCH,
+                files=(
+                    ExampleFile.python(
+                        "case.py",
+                        "def render(enabled):\n    if not enabled:\n        return None\n    item = make_item()\n    payload = item\n    return build(payload=payload)\n",
+                    ),
+                ),
+                focus_path=PurePosixPath("case.py"),
+                expected_count=1,
+                public=True,
+            ),
+            RuleExample(
+                example_id="direct-after-guard",
+                scenario="completed-guard",
+                title="Pass the fresh original directly",
+                outcome=ExampleOutcome.NO_MATCH,
+                files=(
+                    ExampleFile.python(
+                        "case.py",
+                        "def render(enabled):\n    if not enabled:\n        return None\n    item = make_item()\n    return build(payload=item)\n",
+                    ),
+                ),
+                focus_path=PurePosixPath("case.py"),
+                expected_count=0,
+                public=True,
+            ),
         ),
     )
     description = documentation.summary
@@ -159,7 +192,6 @@ class NoRedundantLocalAlias(Rule):
             return []
         provenance = context.resource_provenance
         names = {node.targets[0].id for node in candidates if isinstance(node.targets[0], ast.Name)}
-        reads = _scope_reads(provenance, names)
         conditional_sources = _conditional_sources(context)
         quoted = _quoted_references(context, provenance, names)
         positions = {statement: i for owner in context.nodes(*_SUITES) for i, statement in enumerate(owner.body)}
@@ -172,7 +204,7 @@ class NoRedundantLocalAlias(Rule):
                 continue
             if (provenance.scope(assignment), target.id) in quoted:
                 continue
-            use = _single_keyword_read(target, provenance, reads, keywords)
+            use = _single_keyword_read(target, provenance, keywords)
             if use is None:
                 continue
             if not _dominates(assignment, use, context.parents, positions):
@@ -237,12 +269,13 @@ def _local_assignments(context: PythonFileContext, names: set[str]) -> list[ast.
     if not candidates or context.has_wildcard_import:
         return []
     provenance = context.resource_provenance
-    blocked = {provenance.scope(node) for node in context.nodes(*_UNCERTAIN)}
-    blocked.update(
-        provenance.scope(node) for node in context.nodes(ast.IfExp) if not _parameter_choice(node, provenance)
-    )
+    boundaries = _scope_boundaries(context, provenance)
     eligible = [
-        node for node in candidates if isinstance(scope := provenance.scope(node), _FUNCTIONS) and scope not in blocked
+        node
+        for node in candidates
+        if isinstance(scope := provenance.scope(node), _FUNCTIONS)
+        and (boundary := boundaries.get(scope, 0)) is not None
+        and _after_prefix(node, boundary, provenance)
     ]
     if not eligible or context.dynamic_namespace or _observes_references(context):
         return []
@@ -251,6 +284,63 @@ def _local_assignments(context: PythonFileContext, names: set[str]) -> list[ast.
     return eligible
 
 
+def _scope_boundaries(context: PythonFileContext, provenance: ResourceProvenance) -> dict[ast.AST | None, int | None]:
+    prefixes = _prefix_bounds(context)
+    boundaries: dict[ast.AST | None, int | None] = {}
+    for node in context.nodes(*_UNCERTAIN):
+        scope = provenance.scope(node)
+        prefix = prefixes.get(node)
+        if prefix is None or context.parents.get(prefix) is not scope:
+            boundaries[scope] = None
+        elif (boundary := boundaries.get(scope, 0)) is not None:
+            boundaries[scope] = max(boundary, prefix.end_lineno or prefix.lineno)
+    for node in context.nodes(ast.IfExp):
+        if not _parameter_choice(node, provenance):
+            boundaries[provenance.scope(node)] = None
+    return boundaries
+
+
+def _prefix_bounds(context: PythonFileContext) -> dict[ast.AST, ast.If]:
+    bounds: dict[ast.AST, ast.If] = {}
+    for function in context.nodes(*_FUNCTIONS):
+        for root in function.body:
+            if isinstance(root, ast.If):
+                for node in _prefix_conditions(root):
+                    bounds[node] = root
+    return bounds
+
+
+def _prefix_conditions(root: ast.If) -> Iterator[ast.AST]:
+    pending: list[tuple[ast.AST, bool]] = [(root, False)]
+    while pending:
+        node, inside_test = pending.pop()
+        if isinstance(node, _NESTED_SCOPES):
+            continue
+        if isinstance(node, ast.If) or (isinstance(node, ast.BoolOp) and inside_test):
+            yield node
+        pending.extend(
+            (child, inside_test or (isinstance(node, ast.If) and child is node.test)) for child in children(node)
+        )
+
+
+def _after_prefix(assignment: ast.Assign, boundary: int, provenance: ResourceProvenance) -> bool:
+    if not boundary:
+        return True
+    if not isinstance(assignment.value, ast.Name):
+        return False
+    scope = provenance.scope(assignment)
+    bindings = provenance.bindings.get(scope, {}).get(assignment.value.id, ())
+    if len(bindings) != 1 or not isinstance(bindings[0], ast.Name):
+        return False
+    initializer = provenance.parents.get(bindings[0])
+    return (
+        isinstance(initializer, ast.Assign | ast.AnnAssign)
+        and provenance.parents.get(initializer) is scope
+        and provenance.parents.get(assignment) is scope
+        and initializer.lineno > boundary
+    )
+
+
 def _compiles(context: PythonFileContext) -> bool:
     if context.tree is None:
         return False
@@ -272,14 +362,6 @@ def _parameter_choice(node: ast.IfExp, provenance: ResourceProvenance) -> bool:
     return len(bindings) == 1 and isinstance(bindings[0], ast.arg)
 
 
-def _scope_reads(provenance: ResourceProvenance, names: set[str]) -> dict[tuple[ast.AST | None, str], list[ast.Name]]:
-    reads: dict[tuple[ast.AST | None, str], list[ast.Name]] = defaultdict(list)
-    for name in names:
-        for read in provenance.reads.get(name, ()):
-            reads[provenance.scope(read), name].append(read)
-    return reads
-
-
 def _conditional_sources(context: PythonFileContext) -> set[tuple[ast.AST | None, str]]:
     provenance = context.resource_provenance
     pending: list[ast.AST] = list(context.nodes(ast.IfExp))
@@ -299,12 +381,13 @@ def _conditional_sources(context: PythonFileContext) -> set[tuple[ast.AST | None
 def _single_keyword_read(
     target: ast.Name,
     provenance: ResourceProvenance,
-    reads: Mapping[tuple[ast.AST | None, str], list[ast.Name]],
     keywords: Mapping[ast.Name, str],
 ) -> ast.Name | None:
     scope = provenance.scope(target)
-    uses = reads.get((scope, target.id), ())
-    if provenance.bindings.get(scope, {}).get(target.id) != [target] or len(uses) != 1:
+    if provenance.bindings.get(scope, {}).get(target.id) != [target]:
+        return None
+    uses = provenance.binding_reads(target.id, target)
+    if len(uses) != 1:
         return None
     [use] = uses
     if keywords.get(use) != target.id or _statement(use, provenance.parents) is None: