django-orm-lens 1.2.4__tar.gz → 1.2.6__tar.gz

{django_orm_lens-1.2.4 → django_orm_lens-1.2.6}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-orm-lens
-Version: 1.2.4
+Version: 1.2.6
 Summary: Static analysis + MCP server for Django models. Sidebar tree, ER diagrams, and JSON output for terminals and AI coding agents.
 Author: frowningdev
 License: MIT

{django_orm_lens-1.2.4 → django_orm_lens-1.2.6}/django_orm_lens/parser.py

@@ -135,12 +135,20 @@ def _build_body_regexes(indent: int):
     # ``[^=]+`` is safe because ``=`` never appears inside a type expression
     # (subscripts, unions, dotted refs, and generics all use other punctuation).
     ann = r"(?:\s*:[^=]+)?"
+    # ``(?:[A-Za-z_][A-Za-z0-9_]*\.)?`` — optional single-identifier prefix on
+    # the RHS. Covers:
+    #   * aliased models module — ``from django.db import models as m; x = m.CharField(...)``
+    #   * third-party field packages — ``x = jsonfield.JSONField(default=dict)``
+    #   * standard bare imports — ``from django.db.models import CharField; x = CharField(...)``
+    # Safe against false positives because the type name is still restricted
+    # to Django's known field whitelist (BARE_FIELD_TYPES).
+    prefix_opt = r"(?:[A-Za-z_][A-Za-z0-9_]*\.)?"
     result = {
         "FIELD_RE": re.compile(
             rf"^{w}([a-zA-Z_][a-zA-Z0-9_]*){ann}\s*=\s*models\.([A-Za-z_][A-Za-z0-9_]*)\s*\("
         ),
         "BARE_FIELD_RE": re.compile(
-            rf"^{w}([a-zA-Z_][a-zA-Z0-9_]*){ann}\s*=\s*({BARE_FIELD_TYPES})\s*\("
+            rf"^{w}([a-zA-Z_][a-zA-Z0-9_]*){ann}\s*=\s*{prefix_opt}({BARE_FIELD_TYPES})\s*\("
         ),
         "META_START_RE": re.compile(rf"^{w}class\s+Meta\s*(?:\([^)]*\))?\s*:"),
         "META_ITEM_RE": re.compile(
@@ -390,7 +398,12 @@ def _collect_defs(file_path: str, content: str) -> List[ParsedModel]:
     result with definitions from other files before calling
     ``_resolve_and_filter``.
     """
-    lines = content.splitlines()
+    # Expand tab characters to 4 spaces so the ``\s{indent}`` prefix used in
+    # FIELD_RE / BARE_FIELD_RE / META_ITEM_RE matches tab-indented code too.
+    # A single ``\t`` character otherwise contributes 1 to ``\s`` even though
+    # it's visually 4 columns — tab-indented models used to have zero fields
+    # detected. Line numbers are preserved (per-line expansion only).
+    lines = [line.expandtabs(4) for line in content.splitlines()]
     all_defs: List[ParsedModel] = []
     parent = os.path.basename(os.path.dirname(file_path))
     if parent == "models":

{django_orm_lens-1.2.4 → django_orm_lens-1.2.6}/django_orm_lens.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-orm-lens
-Version: 1.2.4
+Version: 1.2.6
 Summary: Static analysis + MCP server for Django models. Sidebar tree, ER diagrams, and JSON output for terminals and AI coding agents.
 Author: frowningdev
 License: MIT

{django_orm_lens-1.2.4 → django_orm_lens-1.2.6}/django_orm_lens.egg-info/SOURCES.txt

@@ -18,6 +18,7 @@ django_orm_lens.egg-info/entry_points.txt
 django_orm_lens.egg-info/requires.txt
 django_orm_lens.egg-info/top_level.txt
 tests/test_abstract_and_auth_user.py
+tests/test_aliased_module_and_third_party_fields.py
 tests/test_cli_hint.py
 tests/test_cli_subcommands_smoke.py
 tests/test_cli_verbose.py
@@ -34,4 +35,5 @@ tests/test_pep526_type_hints.py
 tests/test_pep695_generic_classes.py
 tests/test_query_analyzer.py
 tests/test_scan_root.py
-tests/test_signals_parser.py
+tests/test_signals_parser.py
+tests/test_tab_indented_models.py

{django_orm_lens-1.2.4 → django_orm_lens-1.2.6}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "django-orm-lens"
-version = "1.2.4"
+version = "1.2.6"
 description = "Static analysis + MCP server for Django models. Sidebar tree, ER diagrams, and JSON output for terminals and AI coding agents."
 readme = "README.md"
 requires-python = ">=3.9"

django_orm_lens-1.2.6/tests/test_aliased_module_and_third_party_fields.py

@@ -0,0 +1,94 @@
+"""Regression tests for two field-detection gaps surfaced by targeted fuzz:
+
+1. **Aliased models module.** ``from django.db import models as m`` followed
+   by ``class X(m.Model): x = m.CharField(...)`` used to lose every field
+   because ``FIELD_RE`` hardcoded the ``models\\.`` prefix and
+   ``BARE_FIELD_RE`` had no prefix allowance at all.
+
+2. **Third-party field packages.** Fields declared via a namespaced
+   third-party import - ``x = jsonfield.JSONField(default=dict)``,
+   ``x = timezonefield.TimeZoneField()`` - also fell through the same
+   two-way gap.
+
+Fixed by adding an optional single-identifier prefix on the RHS in
+``BARE_FIELD_RE``. Safe against false positives because the type name
+is still restricted to Django's known field whitelist
+(``BARE_FIELD_TYPES``) - random ``foo.CharField(...)`` calls in
+non-Django code won't leak in unless the trailing name is a real
+Django field type.
+"""
+
+from __future__ import annotations
+
+import unittest
+
+from django_orm_lens.parser import parse_models_file
+
+
+class AliasedModelsModuleTest(unittest.TestCase):
+    def test_all_fields_captured_via_alias(self) -> None:
+        src = (
+            "from django.db import models as m\n\n"
+            "class Order(m.Model):\n"
+            "    status = m.CharField(max_length=20)\n"
+            "    total = m.DecimalField(max_digits=10, decimal_places=2)\n"
+            "    quantity = m.IntegerField(default=1)\n"
+        )
+        models = parse_models_file("shop/models.py", src)
+        self.assertEqual(len(models), 1)
+        self.assertEqual(models[0].name, "Order")
+        self.assertEqual(
+            [f.name for f in models[0].fields],
+            ["status", "total", "quantity"],
+        )
+        self.assertEqual(models[0].fields[0].type, "CharField")
+
+    def test_mixed_alias_and_plain_and_bare(self) -> None:
+        # One model, three import styles interleaved - every field must
+        # be captured regardless of prefix.
+        src = (
+            "from django.db import models as m\n"
+            "from django.db.models import IntegerField\n\n"
+            "class Row(m.Model):\n"
+            "    aliased = m.CharField(max_length=10)\n"
+            "    plain = models.TextField()\n"
+            "    bare = IntegerField(default=0)\n"
+        )
+        models = parse_models_file("t/models.py", src)
+        self.assertEqual(
+            [f.name for f in models[0].fields],
+            ["aliased", "plain", "bare"],
+        )
+
+
+class ThirdPartyFieldPackageTest(unittest.TestCase):
+    def test_jsonfield_style_package(self) -> None:
+        # `django-jsonfield`-style: `x = jsonfield.JSONField(default=dict)`.
+        # JSONField is in the standard whitelist, so this must match even
+        # under a non-`models.` prefix.
+        src = (
+            "import jsonfield\n\n"
+            "class Config(models.Model):\n"
+            "    data = jsonfield.JSONField(default=dict)\n"
+        )
+        models = parse_models_file("t/models.py", src)
+        self.assertEqual([f.name for f in models[0].fields], ["data"])
+        self.assertEqual(models[0].fields[0].type, "JSONField")
+
+    def test_plain_bare_import_still_works(self) -> None:
+        # Backward-compat: the pre-fix bare form (no prefix at all) must
+        # still match - the prefix is truly optional, not required.
+        src = (
+            "from django.db.models import CharField, IntegerField\n\n"
+            "class R(models.Model):\n"
+            "    name = CharField(max_length=50)\n"
+            "    count = IntegerField(default=0)\n"
+        )
+        models = parse_models_file("t/models.py", src)
+        self.assertEqual(
+            [f.name for f in models[0].fields], ["name", "count"]
+        )
+
+
+if __name__ == "__main__":
+    unittest.main()

django_orm_lens-1.2.6/tests/test_tab_indented_models.py

@@ -0,0 +1,54 @@
+"""Regression: tab-indented model bodies must parse.
+
+Editors that default to tabs (or projects that use PEP-8 exceptions with
+tabs) produced empty models - every field silently dropped. Root cause:
+``FIELD_RE`` uses ``\\s{indent}`` as its column prefix and
+``_detect_class_indent`` expands tabs to width 4, but a single ``\\t``
+character is only one match for ``\\s``, not four. Fixed by pre-expanding
+tabs to spaces in the line buffer before regex matching.
+"""
+
+from __future__ import annotations
+
+import unittest
+
+from django_orm_lens.parser import parse_models_file
+
+
+class TabIndentationTest(unittest.TestCase):
+    def test_pure_tab_indented_body(self) -> None:
+        src = (
+            "class Post(models.Model):\n"
+            "\ttitle = models.CharField(max_length=100)\n"
+            "\tauthor = models.CharField(max_length=100)\n"
+            "\tbody = models.TextField()\n"
+        )
+        models = parse_models_file("blog/models.py", src)
+        self.assertEqual(len(models), 1)
+        self.assertEqual(
+            [f.name for f in models[0].fields],
+            ["title", "author", "body"],
+        )
+
+    def test_mixed_tab_then_space(self) -> None:
+        # Editors that mid-migrate to tabs sometimes end up with a tab
+        # followed by a space; that used to fail equally silently.
+        src = (
+            "class M(models.Model):\n"
+            "\t x = models.CharField(max_length=5)\n"
+        )
+        models = parse_models_file("t/models.py", src)
+        self.assertEqual([f.name for f in models[0].fields], ["x"])
+
+    def test_space_indented_still_works(self) -> None:
+        # Backward-compat guard.
+        src = (
+            "class M(models.Model):\n"
+            "    x = models.CharField(max_length=5)\n"
+        )
+        models = parse_models_file("t/models.py", src)
+        self.assertEqual([f.name for f in models[0].fields], ["x"])
+
+
+if __name__ == "__main__":
+    unittest.main()