omdev 0.0.0.dev329__py3-none-any.whl → 0.0.0.dev331__py3-none-any.whl

omdev/manifests/build.py

@@ -4,6 +4,7 @@ TODO:
  - verify classes instantiate
  - embed in pyproject
  - roundtrip flexibility regarding json-ness - tuples vs lists vs sets vs frozensets etc
+ - kill _MANIFEST_GLOBAL_PATS lol, ast walk
 
 See (entry_points):
  - https://github.com/pytest-dev/pluggy/blob/main/src/pluggy/_manager.py#L405
@@ -49,12 +50,13 @@ T = ta.TypeVar('T')
 MANIFEST_MAGIC_KEY = '@omlish-manifest'
 
 
-_MANIFEST_GLOBAL_PATS = tuple(re.compile(p) for p in [
-    # _FOO_MANIFEST = FooManifest(...
-    r'^(?P<name>[A-Za-z_][A-Za-z0-9_]*)\s*=.*',
+_IDENT_PAT_PART = r'[A-Za-z_][A-Za-z0-9_]*'
+_NAME_PAT_PART = rf'(?P<name>{_IDENT_PAT_PART})'
 
-    # class _FOO_MANIFEST(StaticFooManifest): ...
-    r'^class (?P<name>[A-Za-z_][A-Za-z0-9_]*)\s*(\(|$)',
+_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+=.*',
 ])
 
 

{omdev-0.0.0.dev329.dist-info → omdev-0.0.0.dev331.dist-info}/METADATA

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

{omdev-0.0.0.dev329.dist-info → omdev-0.0.0.dev331.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=1Ah6NhNylAT-bIfDlKDOVlfitxe9UNYPudOwxO0s1aY,10025
+omdev/manifests/build.py,sha256=4Tevfhnw6Vn4EqgYoGKKjp7_n6bvs2-rAXLo30MLy-I,10107
 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.dev329.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev329.dist-info/METADATA,sha256=z3568Aqvu1Syp9FZ6byg_KN9JedcTIIqQBW5Dyydgxk,1674
-omdev-0.0.0.dev329.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omdev-0.0.0.dev329.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev329.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev329.dist-info/RECORD,,
+omdev-0.0.0.dev331.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev331.dist-info/METADATA,sha256=2TuM1kEw9-6V16uiUVTeto3mB5e8W1YYl2WpuTRw7rI,1674
+omdev-0.0.0.dev331.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omdev-0.0.0.dev331.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev331.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev331.dist-info/RECORD,,