omdev 0.0.0.dev338__py3-none-any.whl → 0.0.0.dev339__py3-none-any.whl

omdev/manifests/build.py

@@ -5,6 +5,7 @@ TODO:
  - embed in pyproject
  - roundtrip flexibility regarding json-ness - tuples vs lists vs sets vs frozensets etc
  - kill _MANIFEST_GLOBAL_PATS lol, ast walk
+  - garbage skip_pat doesn't handle multiline decos, etc
 
 See (entry_points):
  - https://github.com/pytest-dev/pluggy/blob/main/src/pluggy/_manager.py#L405
@@ -53,18 +54,31 @@ MANIFEST_MAGIC_KEY = '@omlish-manifest'
 _IDENT_PAT_PART = r'[A-Za-z_][A-Za-z0-9_]*'
 _NAME_PAT_PART = rf'(?P<name>{_IDENT_PAT_PART})'
 
-_MANIFEST_GLOBAL_PATS = tuple(re.compile(p) for p in [
-    rf'^{_NAME_PAT_PART}\s*=.*',
-    rf'^class {_NAME_PAT_PART}\s*(\(|$)',
-    rf'^{_NAME_PAT_PART}:\s+(ta\.|typing\.||)TypeAlias\s+=.*',
-])
 
+@dc.dataclass(frozen=True)
+class _ManifestGlobalPat:
+    name_pat: re.Pattern
+    skip_pat: ta.Optional[re.Pattern] = None
 
-def extract_manifest_target_name(line: str) -> str:
-    for pat in _MANIFEST_GLOBAL_PATS:
-        if (m := pat.match(line)) is not None:
-            return m.groupdict()['name']
-    raise Exception(line)
+
+_MANIFEST_GLOBAL_PATS: ta.Sequence[_ManifestGlobalPat] = [
+    _ManifestGlobalPat(re.compile(rf'^{_NAME_PAT_PART}\s*=.*')),
+    _ManifestGlobalPat(re.compile(rf'^class {_NAME_PAT_PART}\s*(\(|:|$)'), re.compile(r'^[#@].*')),
+    _ManifestGlobalPat(re.compile(rf'^{_NAME_PAT_PART}:\s+(ta\.|typing\.|)?TypeAlias\s+=.*')),
+]
+
+
+def extract_manifest_target_name(lines: ta.Sequence[str], start_idx: int) -> str:
+    check.not_isinstance(lines, str)
+    for mgp in _MANIFEST_GLOBAL_PATS:
+        cur_idx = start_idx
+        while cur_idx < len(lines):
+            if (m := mgp.name_pat.match(lines[cur_idx])) is not None:
+                return m.groupdict()['name']
+            if mgp.skip_pat is None or not mgp.skip_pat.match(lines[cur_idx]):
+                break
+            cur_idx += 1
+    raise Exception(lines[start_idx])
 
 
 _INLINE_MANIFEST_CLS_NAME_PAT = re.compile(r'^(?P<cls_name>[_a-zA-Z][_a-zA-Z0-9.]*)\s*(?P<cls_args>\()?')
@@ -125,18 +139,28 @@ class ManifestBuilder:
 
         lines = src.splitlines(keepends=True)
 
+        def prepare(s: str) -> ta.Any:
+            if s.startswith('$.'):
+                s = f'{mod_base}.{s[2:]}'
+            return magic.py_compile_magic_preparer(s)
+
         magics = magic.find_magic(
             magic.PY_MAGIC_STYLE,
             lines,
             file=file,
             keys={MANIFEST_MAGIC_KEY},
+            preparer=prepare,
         )
 
         origins: ta.List[ManifestOrigin] = []
         targets: ta.List[dict] = []
         for m in magics:
             if m.body:
-                pat_match = check.not_none(_INLINE_MANIFEST_CLS_NAME_PAT.match(m.body))
+                body = m.body
+                if body.startswith('$.'):
+                    body = f'{mod_base}.{body[2:]}'
+
+                pat_match = check.not_none(_INLINE_MANIFEST_CLS_NAME_PAT.match(body))
                 cls_name = check.non_empty_str(pat_match.groupdict()['cls_name'])
                 has_cls_args = bool(pat_match.groupdict().get('cls_args'))
 
@@ -151,14 +175,14 @@ class ManifestBuilder:
                 check.is_(cls_reload, cls)
 
                 if has_cls_args:
-                    inl_init_src = m.body[len(cls_name):]
+                    inl_init_src = body[len(cls_name):]
                 else:
                     inl_init_src = '()'
 
                 inl_kw: dict = {}
 
                 if issubclass(cls, ModAttrManifest):
-                    attr_name = extract_manifest_target_name(lines[m.end_line])
+                    attr_name = extract_manifest_target_name(lines, m.end_line)
                     inl_kw.update({
                         'mod_name': mod_name,
                         'attr_name': attr_name,
@@ -183,8 +207,7 @@ class ManifestBuilder:
                 })
 
             else:
-                nl = lines[m.end_line]
-                attr_name = extract_manifest_target_name(nl)
+                attr_name = extract_manifest_target_name(lines, m.end_line)
 
                 origin = ManifestOrigin(
                     module='.'.join(['', *mod_name.split('.')[1:]]),

{omdev-0.0.0.dev338.dist-info → omdev-0.0.0.dev339.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev338
+Version: 0.0.0.dev339
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev338
+Requires-Dist: omlish==0.0.0.dev339
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev338.dist-info → omdev-0.0.0.dev339.dist-info}/RECORD

@@ -165,7 +165,7 @@ omdev/magic/prepare.py,sha256=V5jYT2AeFmazzPwk9sNismSouLwFXEoik6FwKcWCNUY,589
 omdev/magic/styles.py,sha256=pYI57zFBxcaZAeyQaDtU1L6oVvdPQiB7ADaBKoUI7Q8,659
 omdev/manifests/__init__.py,sha256=Y3l4WY4JRi2uLG6kgbGp93fuGfkxkKwZDvhsa0Rwgtk,15
 omdev/manifests/__main__.py,sha256=JqyVDyV7_jo-NZ3wSs5clDU_xCMlxzJv-XFohoZWQ7E,174
-omdev/manifests/build.py,sha256=4Tevfhnw6Vn4EqgYoGKKjp7_n6bvs2-rAXLo30MLy-I,10107
+omdev/manifests/build.py,sha256=vZtGhQAcLrhtIYsq04OstYVjkIwpW2IhmXMkh6RTop8,11009
 omdev/manifests/dumping.py,sha256=Cj0IbuHVS_Xgvj3H7wZr76UTsDuF_LBgca0BocgMV9I,4048
 omdev/manifests/main.py,sha256=7zRlyE0BDPqITEbChlTBRGulAvG1nUZPHXrerNExriE,2126
 omdev/mypy/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -296,9 +296,9 @@ omdev/tools/json/rendering.py,sha256=3HhdlKSetS6iK1tjF2aILzsl8Mb3D8wW92vYwGpRdVA
 omdev/tools/pawk/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/pawk/__main__.py,sha256=VCqeRVnqT1RPEoIrqHFSu4PXVMg4YEgF4qCQm90-eRI,66
 omdev/tools/pawk/pawk.py,sha256=zsEkfQX0jF5bn712uqPAyBSdJt2dno1LH2oeSMNfXQI,11424
-omdev-0.0.0.dev338.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev338.dist-info/METADATA,sha256=DqipAfDJkF8fdgokU6IFUDN1Eu_veiwAWV0mm4Fiyvc,1674
-omdev-0.0.0.dev338.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omdev-0.0.0.dev338.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev338.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev338.dist-info/RECORD,,
+omdev-0.0.0.dev339.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev339.dist-info/METADATA,sha256=JXhgdNBLzWLNp-9mxu_-QfhmIxYKb4fPQ0Uok-P3RIQ,1674
+omdev-0.0.0.dev339.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omdev-0.0.0.dev339.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev339.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev339.dist-info/RECORD,,