diffimpactscout 0.4.0__tar.gz → 0.5.0__tar.gz

{diffimpactscout-0.4.0/src/diffimpactscout.egg-info → diffimpactscout-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diffimpactscout
-Version: 0.4.0
+Version: 0.5.0
 Summary: Incremental pre-push guard and AST blast-radius impact analyzer for git repositories.
 Author: DiffImpactScout contributors
 License: MIT

{diffimpactscout-0.4.0 → diffimpactscout-0.5.0}/setup.py

@@ -7,7 +7,7 @@ with io.open("README.md", encoding="utf-8") as fh:
 
 setup(
     name="diffimpactscout",
-    version="0.4.0",
+    version="0.5.0",
     description="Incremental pre-push guard and AST blast-radius impact analyzer for git repositories.",
     long_description=long_description,
     long_description_content_type="text/markdown",

{diffimpactscout-0.4.0 → diffimpactscout-0.5.0}/src/diffimpactscout/__init__.py

@@ -1,3 +1,3 @@
 """diffimpactscout: incremental pre-push guard and AST blast-radius impact analyzer."""
 
-__version__ = "0.4.0"
+__version__ = "0.5.0"

{diffimpactscout-0.4.0 → diffimpactscout-0.5.0}/src/diffimpactscout/impact/impact.py

@@ -299,6 +299,8 @@ def _handler_leaf(handler):
 def _route_binds_handler(urls_entry, handler, mods, path, weak):
     if not mods:
         return True
+    if _module_of(path) in mods:
+        return True
     analysis = _peel(urls_entry)
     if not isinstance(analysis, dict):
         return True

{diffimpactscout-0.4.0 → diffimpactscout-0.5.0}/src/diffimpactscout/impact/python_analyzer.py

@@ -177,7 +177,25 @@ def _usage_resolves(analysis, usage, name, entity_mods, path, weak):
     base = usage.get("base") or ""
     if not base:
         return True
-    return _imports_from(analysis, base.split(".")[0], entity_mods, path)
+    head = base.split(".")[0]
+    if _imports_from(analysis, head, entity_mods, path):
+        return True
+    if _is_imported(analysis, head):
+        return False
+    return _module_of(path) in entity_mods
+
+
+def _is_imported(analysis, name):
+    """Return True when the file binds ``name`` through any import (name or alias)."""
+    usages = (analysis or {}).get("usages")
+    if not isinstance(usages, list):
+        return False
+    for usage in usages:
+        if usage.get("kind") != "import":
+            continue
+        if usage.get("name") == name or usage.get("alias") == name:
+            return True
+    return False
 
 
 def _module_of(path):

{diffimpactscout-0.4.0 → diffimpactscout-0.5.0}/src/diffimpactscout/impact/route_linker.py

@@ -320,7 +320,13 @@ def compose_url_prefixes(root, urls_globs, cfg=None):
         prefix_map[module] = (ppath, pregex)
         for inc_path, inc_regex, target in includes.get(module, []):
             if target in files and target not in prefix_map:
-                queue.append((target, ppath + (inc_path or ""), _concat_regex(pregex, inc_regex)))
+                if inc_path is not None:
+                    child_path = ppath + inc_path
+                    child_regex = _concat_regex(pregex, _route_regex_source(inc_path))
+                else:
+                    child_path = ppath + _literal_from_regex(inc_regex)
+                    child_regex = _concat_regex(pregex, inc_regex)
+                queue.append((target, child_path, child_regex))
     return prefix_map
 
 
@@ -347,27 +353,29 @@ def extract_django_routes(root, urls_globs, cfg=None):
                 continue
             name_val = _str_value(_call_kwarg_value(node, "name"))
             if func.id == "path":
-                composed = ppath + path_val
+                composed_path = ppath + path_val
+                composed_regex = _concat_regex(pregex, _route_regex_source(path_val))
                 routes.append(
                     Route(
                         name_val,
                         path_val,
                         handler,
                         posix,
-                        full=composed,
-                        regex=_route_regex(composed),
+                        full=composed_path,
+                        regex=_anchored_regex(composed_regex),
                     )
                 )
             else:
-                composed = _concat_regex(pregex, path_val)
+                composed_path = ppath + _literal_from_regex(path_val)
+                composed_regex = _concat_regex(pregex, path_val)
                 routes.append(
                     Route(
                         name_val,
                         path_val,
                         handler,
                         posix,
-                        full=composed,
-                        regex=_anchored_regex(composed),
+                        full=composed_path,
+                        regex=_anchored_regex(composed_regex),
                     )
                 )
     return routes
@@ -487,7 +495,7 @@ def extract_frontend_refs(root, frontend_globs, cfg=None, vendor=False, needles=
     return refs
 
 
-def _route_regex(route_path):
+def _route_regex_source(route_path):
     parts = []
     i = 0
     n = len(route_path)
@@ -510,7 +518,27 @@ def _route_regex(route_path):
         else:
             parts.append(re.escape(ch))
             i += 1
-    return re.compile("^" + "".join(parts) + "$")
+    return "".join(parts)
+
+
+def _route_regex(route_path):
+    return re.compile("^" + _route_regex_source(route_path) + "$")
+
+
+def _literal_from_regex(source):
+    """Best-effort literal path for a regex prefix/route (strips ``^`` and ``$``).
+
+    Used to compose the human-readable ``full`` URL when a path prefix and a
+    regex prefix are mixed in the include chain; matching still uses ``regex``.
+    """
+    if not source:
+        return ""
+    s = source
+    if s.startswith("^"):
+        s = s[1:]
+    if s.endswith("$"):
+        s = s[:-1]
+    return s
 
 
 def _is_path_prefix(ref, route_path):

{diffimpactscout-0.4.0 → diffimpactscout-0.5.0/src/diffimpactscout.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: diffimpactscout
-Version: 0.4.0
+Version: 0.5.0
 Summary: Incremental pre-push guard and AST blast-radius impact analyzer for git repositories.
 Author: DiffImpactScout contributors
 License: MIT