omdev 0.0.11__tar.gz → 0.0.13__tar.gz

{omdev-0.0.11/omdev.egg-info → omdev-0.0.13}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.11
+Version: 0.0.13
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,10 +14,10 @@ Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.14
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.11
+Requires-Dist: omlish==0.0.13
 Provides-Extra: all
-Requires-Dist: ominfra==0.0.11; extra == "all"
-Requires-Dist: ommlds==0.0.11; extra == "all"
+Requires-Dist: ominfra==0.0.13; extra == "all"
+Requires-Dist: ommlds==0.0.13; extra == "all"
 Requires-Dist: black~=26.3; extra == "all"
 Requires-Dist: pycparser~=3.0; extra == "all"
 Requires-Dist: pcpp~=1.30; extra == "all"
@@ -33,9 +33,9 @@ Requires-Dist: textual~=8.2; extra == "all"
 Requires-Dist: textual-dev~=1.8; extra == "all"
 Requires-Dist: textual-speedups~=0.2; extra == "all"
 Provides-Extra: ominfra
-Requires-Dist: ominfra==0.0.11; extra == "ominfra"
+Requires-Dist: ominfra==0.0.13; extra == "ominfra"
 Provides-Extra: ommlds
-Requires-Dist: ommlds==0.0.11; extra == "ommlds"
+Requires-Dist: ommlds==0.0.13; extra == "ommlds"
 Provides-Extra: black
 Requires-Dist: black~=26.3; extra == "black"
 Provides-Extra: c

{omdev-0.0.11 → omdev-0.0.13}/omdev/dataclasses/_dumping.py

@@ -44,7 +44,7 @@ def __omlish_amalg__():  # noqa
             dict(path='../../omlish/lite/reflect.py', sha1='c4fec44bf144e9d93293c996af06f6c65fc5e63d'),
             dict(path='../../omlish/lite/strings.py', sha1='89831ecbc34ad80e118a865eceb390ed399dc4d6'),
             dict(path='../../omlish/lite/marshal.py', sha1='66bc88d705df274e9fa1168d2aab20c7e3935cf6'),
-            dict(path='dumping.py', sha1='982d4f7a46f40e48da4daadb082b7e66acb34ae9'),
+            dict(path='dumping.py', sha1='ae4148f671d2cb1e7bf1a819b78ca388b4680bbc'),
         ],
     )
 
@@ -1909,6 +1909,7 @@ class _DataclassCodegenDumper:
             *,
             init_file_path: str,
             out_file_path: str,
+            cfg_pkg_name: ta.Optional[str] = None,
     ) -> None:
         from omlish.dataclasses.impl.configs import PACKAGE_CONFIG_CACHE  # noqa
         from omlish.dataclasses.impl.generation.compilation import OpCompiler  # noqa
@@ -1928,6 +1929,13 @@ class _DataclassCodegenDumper:
                 prepared: GeneratorProcessor.Prepared,
                 comp: OpCompiler.CompileResult,
         ) -> None:
+            if (
+                    cfg_pkg_name is not None and
+                    ctx.pkg_cfg.pkg is not None and
+                    ctx.pkg_cfg.pkg != cfg_pkg_name
+            ):
+                return
+
             d_refs: ta.List[DumpedDataclassCodegen.Ref] = []
             for ref in comp.refs:
                 if isinstance(ref, OpRef):

{omdev-0.0.11 → omdev-0.0.13}/omdev/dataclasses/cli.py

@@ -10,13 +10,21 @@ from .codegen import DataclassCodeGen
 class Cli(ap.Cli):
     @ap.cmd(
         ap.arg('roots', metavar='root', nargs='+'),
+        ap.arg('--dump-inline', action='store_true'),
+        ap.arg('--dry-run', action='store_true'),
+        ap.arg('--print-code', action='store_true'),
+        ap.arg('-j', '--jobs', type=int),
     )
     def codegen(self) -> None:
         import asyncio
+
         asyncio.run(DataclassCodeGen(
-            # dump_inline=True,
+            dump_inline=self.args.dump_inline,
+            print_code=self.args.print_code,
+            dry_run=self.args.dry_run,
         ).run(
             self.args.roots,
+            **(dict(concurrency=self.args.jobs) if self.args.jobs is not None else {}),
         ))
 
 

{omdev-0.0.11 → omdev-0.0.13}/omdev/dataclasses/codegen.py

@@ -74,12 +74,16 @@ class DataclassCodeGen:
             *,
             target_line_width: int | None = None,
             dump_inline: bool = False,
+            print_code: bool = False,
+            dry_run: bool = False,
             subprocess_kwargs: ta.Mapping[str, ta.Any] | None = None,
     ) -> None:
         super().__init__()
 
         self._target_line_width = target_line_width or self.DEFAULT_TARGET_LINE_WIDTH
         self._dump_inline = dump_inline
+        self._print_code = print_code
+        self._dry_run = dry_run
         self._subprocess_kwargs = subprocess_kwargs
 
     #
@@ -198,6 +202,7 @@ class DataclassCodeGen:
         dumper_kwargs = dict(
             init_file_path=cfg_pkg.init_file_path,
             out_file_path=out_file_path,
+            cfg_pkg_name=cfg_pkg.name,
         )
 
         start_time = time.time()
@@ -235,7 +240,8 @@ class DataclassCodeGen:
                 raise RuntimeError(f'Refusing to overwrite non-generated file: {gen_file_path!r}')
 
             if not output.dumped:
-                os.unlink(gen_file_path)
+                if not self._dry_run:
+                    os.unlink(gen_file_path)
                 return
 
         #
@@ -260,7 +266,12 @@ class DataclassCodeGen:
                 continue
 
             cls_name_tup = (x.cls_module, x.cls_qualname)
-            check.not_in(cls_name_tup, seen_cls_name_tups)
+            check.not_in(
+                cls_name_tup,
+                seen_cls_name_tups,
+                f'Class {cls_name_tup!r} has already been seen - this is usually caused by the module failing to '
+                f'successfully import (and trying again) - ensure the module imports successfully.',
+            )
             seen_cls_name_tups.add(cls_name_tup)
 
             try:
@@ -351,8 +362,14 @@ class DataclassCodeGen:
 
         lines.append('')
 
-        with open(gen_file_path, 'w') as f:  # noqa
-            f.write('\n'.join(lines))
+        code = '\n'.join(lines)
+
+        if self._print_code:
+            print(code)
+
+        if not self._dry_run:
+            with open(gen_file_path, 'w') as f:  # noqa
+                f.write(code)
 
     async def run(
             self,

{omdev-0.0.11 → omdev-0.0.13}/omdev/dataclasses/dumping.py

@@ -56,6 +56,7 @@ class _DataclassCodegenDumper:
             *,
             init_file_path: str,
             out_file_path: str,
+            cfg_pkg_name: ta.Optional[str] = None,
     ) -> None:
         from omlish.dataclasses.impl.configs import PACKAGE_CONFIG_CACHE  # noqa
         from omlish.dataclasses.impl.generation.compilation import OpCompiler  # noqa
@@ -75,6 +76,13 @@ class _DataclassCodegenDumper:
                 prepared: GeneratorProcessor.Prepared,
                 comp: OpCompiler.CompileResult,
         ) -> None:
+            if (
+                    cfg_pkg_name is not None and
+                    ctx.pkg_cfg.pkg is not None and
+                    ctx.pkg_cfg.pkg != cfg_pkg_name
+            ):
+                return
+
             d_refs: ta.List[DumpedDataclassCodegen.Ref] = []
             for ref in comp.refs:
                 if isinstance(ref, OpRef):

{omdev-0.0.11 → omdev-0.0.13}/omdev/tools/json/rendering.py

@@ -1,3 +1,4 @@
+# ruff: noqa: SLF001
 import dataclasses as dc
 import json
 import typing as ta
@@ -34,6 +35,9 @@ def make_render_kwargs(opts: RenderingOptions) -> ta.Mapping[str, ta.Any]:
     )
 
 
+##
+
+
 class Renderer(lang.Abstract):
     def __init__(self, opts: RenderingOptions) -> None:
         super().__init__()
@@ -95,11 +99,30 @@ class StreamRenderer(Renderer):
     def __init__(self, opts: RenderingOptions) -> None:
         super().__init__(opts)
 
-        self._renderer = StreamJsonRenderer(
+        self._renderer = self._StreamJsonRenderer(
+            self,
             style=term_color if self._opts.color else None,
             delimiter='\n',
             **self._kw,
         )
 
+    class _StreamJsonRenderer(StreamJsonRenderer):
+        def __init__(self, o: StreamRenderer, **kwargs: ta.Any) -> None:
+            super().__init__(**kwargs)
+
+            self.__o = o
+
+        def _format_scalar(self, o: ta.Any, state: StreamJsonRenderer.State | None = None) -> str:
+            if self.__o._opts.five:
+                return Json5Renderer.render_str(
+                    o,
+                    **self.__o._kw,
+                    multiline_strings=True,
+                    softwrap_length=self.__o._opts.softwrap_length,
+                )
+
+            else:
+                return super()._format_scalar(o, state)
+
     def render(self, e: Event) -> ta.Iterator[str]:
         return self._renderer.render((e,))