omdev 0.0.0.dev338__tar.gz → 0.0.0.dev340__tar.gz

{omdev-0.0.0.dev338/omdev.egg-info → omdev-0.0.0.dev340}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev338
+Version: 0.0.0.dev340
 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.dev340
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev338 → omdev-0.0.0.dev340}/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'^[#@\s].*')),
+    _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 → omdev-0.0.0.dev340/omdev.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev338
+Version: 0.0.0.dev340
 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.dev340
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev338 → omdev-0.0.0.dev340}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev338
+omlish==0.0.0.dev340
 
 [all]
 black~=25.1

{omdev-0.0.0.dev338 → omdev-0.0.0.dev340}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev338'
+version = '0.0.0.dev340'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev338',
+    'omlish == 0.0.0.dev340',
 ]
 
 [project.optional-dependencies]