omdev 0.0.0.dev206__py3-none-any.whl → 0.0.0.dev208__py3-none-any.whl

omdev/cc/cli.py

@@ -16,24 +16,50 @@ Freestanding options:
 ==
 
 TODO:
- - standard deps - cdeps.toml
  - cext interop
  - gen cmake
 """
+import dataclasses as dc
 import os
 import shlex
 import shutil
 import subprocess
 import tempfile
+import tomllib
 import typing as ta
 
+from omlish import cached
 from omlish import check
+from omlish import lang
+from omlish import marshal as msh
 from omlish.argparse import all as ap
+from omlish.formats import json
 
 from .. import magic
 from ..cache import data as dcache
 
 
+@dc.dataclass(frozen=True)
+class Cdep:
+    @dc.dataclass(frozen=True)
+    class Git:
+        url: str
+        rev: str
+
+        subtrees: ta.Sequence[str] | None = None
+
+    git: Git
+
+    include: ta.Sequence[str] | None = None
+
+
+@cached.function
+def load_cdeps() -> ta.Mapping[str, Cdep]:
+    src = lang.get_relative_resources(globals=globals())['cdeps.toml'].read_text()
+    dct = tomllib.loads(src)
+    return msh.unmarshal(dct.get('deps', {}), ta.Mapping[str, Cdep])  # type: ignore
+
+
 class Cli(ap.Cli):
     @ap.cmd(
         ap.arg('--cwd'),
@@ -60,14 +86,18 @@ class Cli(ap.Cli):
         for src_magic in src_magics:
             if src_magic.key == '@omlish-cdeps':
                 for dep in check.isinstance(src_magic.prepared, ta.Sequence):
-                    dep_git = dep['git']
+                    if isinstance(dep, ta.Mapping):
+                        dep = msh.unmarshal(dep, Cdep)  # type: ignore
+                    else:
+                        dep = load_cdeps()[check.isinstance(dep, str)]
+
                     dep_spec = dcache.GitSpec(
-                        url=dep_git['url'],
-                        rev=dep_git['rev'],
-                        subtrees=dep_git.get('subtrees'),
+                        url=dep.git.url,
+                        rev=dep.git.rev,
+                        subtrees=dep.git.subtrees,
                     )
                     dep_dir = dcache.default().get(dep_spec)
-                    for dep_inc in dep.get('include', []):
+                    for dep_inc in dep.include or []:
                         inc_dir = os.path.join(dep_dir, dep_inc)
                         check.state(os.path.isdir(inc_dir))
                         include_dirs.append(inc_dir)
@@ -134,6 +164,13 @@ class Cli(ap.Cli):
     #     # //$(which true); exec om cc run "$0" "$@"
     #     print(self.args.src_file)
 
+    #
+
+    @ap.cmd()
+    def list_deps(self) -> None:
+        cdeps = load_cdeps()
+        print(json.dumps_pretty(msh.marshal(cdeps)))
+
 
 def _main() -> None:
     Cli().cli_run_and_exit()

omdev/tools/json/formats.py

@@ -55,7 +55,7 @@ class Formats(enum.Enum):
 
     PY = Format(['py', 'python', 'repr'], lambda f: ast.literal_eval(f.read()))
 
-    XML = Format(['xml'], lambda f: xml.build_simple_element(xml.parse_tree(f.read()).getroot()).as_dict())
+    XML = Format(['xml'], lambda f: xml.build_simple_element(xml.parse_tree(f.read()).getroot()).se_dict())
 
     CSV = Format(['csv'], lambda f: list(csv.DictReader(f)))
     TSV = Format(['tsv'], lambda f: list(csv.DictReader(f, delimiter='\t')))

{omdev-0.0.0.dev206.dist-info → omdev-0.0.0.dev208.dist-info}/METADATA

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

{omdev-0.0.0.dev206.dist-info → omdev-0.0.0.dev208.dist-info}/RECORD

@@ -44,7 +44,7 @@ omdev/cache/data/manifests.py,sha256=4BparztsMZo9DDVVPhv6iv5g4kK7QAi8Vqtj3PbKkco
 omdev/cache/data/specs.py,sha256=8o0b7goqvnezB_lD46w4ySp2KMZ8In3nqbtmfUT7v6c,2504
 omdev/cc/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/cc/__main__.py,sha256=n7gxSRYZ1QZOUxQPCT0_n9Xl26zi2UIvCwyGW_m67nA,166
-omdev/cc/cli.py,sha256=rrqu-NnSFlofWBw3qKiWMqFwefC5z1o207nH1_6OAu0,3584
+omdev/cc/cli.py,sha256=k8WhcFS2GS5GUR6JkGIG9wN86KOoPN9mGtX01cpuEAA,4498
 omdev/cexts/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/cexts/_boilerplate.cc,sha256=sbpXEgdFrkdzZXgaNWFFNN27fL9TZu6VrwvMY4-nnFM,1726
 omdev/cexts/build.py,sha256=F3z1-CjDlEM-Gzi5IunKUBO52qdH_pMsFylobTdGJnI,2654
@@ -178,7 +178,7 @@ omdev/tools/sqlrepl.py,sha256=wAjrfXNrRV63-NJCC2HlGQnFh7lUH0bHMnOjYotQqFs,5753
 omdev/tools/json/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/json/__main__.py,sha256=wqpkN_NsQyNwKW4qjVj8ADJ4_C98KhrFBtE-Z1UamfU,168
 omdev/tools/json/cli.py,sha256=EubIMT-n2XsjWBZjSy2fWXqijlwrIhLsfbkg3SZzi28,9586
-omdev/tools/json/formats.py,sha256=XHabWAQnAQ9uNS7fHu3mdgxoptWw00RVLq08uadD6kk,1753
+omdev/tools/json/formats.py,sha256=S8O0-A2_b_kXUevBme4KlSG0V5Nl-WXp8emRub1zMmA,1753
 omdev/tools/json/io.py,sha256=sfj2hJS9Hy3aUR8a_lLzOrYcmL9fSKyvOHiofdUASsI,1427
 omdev/tools/json/parsing.py,sha256=YOeTRY6Gd89EfcHvqXO5PRWJ3IgRCpNnI54Lb_N3v2k,2183
 omdev/tools/json/processing.py,sha256=iFm5VqaxJ97WHaun2ed7NEjMxhFeJqf28bLNfoDJft0,1209
@@ -186,9 +186,9 @@ omdev/tools/json/rendering.py,sha256=tMcjOW5edfozcMSTxxvF7WVTsbYLoe9bCKFh50qyaGw
 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=Eckymn22GfychCQcQi96BFqRo_LmiJ-EPhC8TTUJdB4,11446
-omdev-0.0.0.dev206.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev206.dist-info/METADATA,sha256=GCfofnkHpmbLZxobRuLjC3PYfiG0tkzZTjJTm8idSU8,1760
-omdev-0.0.0.dev206.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-omdev-0.0.0.dev206.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev206.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev206.dist-info/RECORD,,
+omdev-0.0.0.dev208.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev208.dist-info/METADATA,sha256=hK5sVtOi7IbLSbSc174QSzrgc9mdIwrymwHF7luLJmw,1760
+omdev-0.0.0.dev208.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+omdev-0.0.0.dev208.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev208.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev208.dist-info/RECORD,,