omdev 0.0.0.dev438__py3-none-any.whl → 0.0.0.dev439__py3-none-any.whl

omdev/tokens/utils.py

@@ -27,6 +27,7 @@ def is_ws(tok: Token) -> bool:
 def ignore_ws(
         toks: ta.Iterable[Token],
         *,
+        drop_nl: bool = False,
         keep: ta.Container[str] = (),
 ) -> ta.Iterable[Token]:
     if isinstance(keep, str):
@@ -34,7 +35,7 @@ def ignore_ws(
     return (
         t
         for t in toks
-        if t.name in keep or t.name not in WS_NAMES
+        if t.name in keep or (t.name not in WS_NAMES and not (drop_nl and t.name == 'NL'))
     )
 
 

omdev/tools/json/cli.py

@@ -195,7 +195,7 @@ def _main() -> None:
         else:
             in_file = es.enter_context(open(args.file, 'rb'))
 
-        def yield_input() -> ta.Generator[bytes]:
+        def yield_input() -> ta.Iterator[bytes]:
             fd = check.isinstance(in_file.fileno(), int)
 
             while True:
@@ -240,7 +240,7 @@ def _main() -> None:
                 def flush_output(
                         fn: ta.Callable[[T], ta.Iterable[U]],
                         i: T,
-                ) -> ta.Generator[U]:
+                ) -> ta.Iterator[U]:
                     n = 0
                     for o in fn(i):
                         yield o
@@ -259,7 +259,7 @@ def _main() -> None:
                     def append_newlines(
                             fn: ta.Callable[[T], ta.Iterable[str]],
                             i: T,
-                    ) -> ta.Generator[str]:
+                    ) -> ta.Iterator[str]:
                         yield from fn(i)
                         yield '\n'
 
@@ -267,15 +267,15 @@ def _main() -> None:
                     pipeline = fp.bind(append_newlines, pipeline)  # Any -> [str]
                     pipeline = fp.bind(lang.flatmap, pipeline)  # [Any] -> [str]
                     pipeline = fp.pipe(fp.bind(lang.flatmap, processor.process), pipeline)  # [Any] -> [str]
-                    pipeline = fp.pipe(fp.bind(lang.flatmap, builder.build), pipeline)  # [JsonStreamParserEvent] -> [str]  # noqa
+                    pipeline = fp.pipe(fp.bind(lang.flatmap, builder.build), pipeline)  # [Event] -> [str]  # noqa
                     pipeline = fp.pipe(parser.parse, pipeline)  # bytes -> [str]
 
                 else:
                     renderer = StreamRenderer(cfg.rendering)
                     trailing_newline = True
 
-                    pipeline = renderer.render  # JsonStreamParserEvent -> [str]
-                    pipeline = fp.bind(lang.flatmap, pipeline)  # [JsonStreamParserEvent] -> [str]
+                    pipeline = renderer.render  # Event -> [str]
+                    pipeline = fp.bind(lang.flatmap, pipeline)  # [Event] -> [str]
                     pipeline = fp.pipe(parser.parse, pipeline)  # bytes -> [str]
 
                 pipeline = fp.bind(flush_output, pipeline)  # bytes -> [str]

omdev/tools/json/parsing.py

@@ -6,8 +6,8 @@ from omlish import check
 from omlish import lang
 from omlish.formats.json.stream.building import JsonValueBuilder
 from omlish.formats.json.stream.lexing import JsonStreamLexer
+from omlish.formats.json.stream.parsing import Event
 from omlish.formats.json.stream.parsing import JsonStreamParser
-from omlish.formats.json.stream.parsing import JsonStreamParserEvent
 from omlish.io.buffers import DelimitingBuffer
 
 from .formats import Format
@@ -22,7 +22,7 @@ class EagerParser:
 
         self._fmt = fmt
 
-    def parse(self, f: ta.TextIO) -> ta.Generator[ta.Any]:
+    def parse(self, f: ta.TextIO) -> ta.Iterator[ta.Any]:
         return self._fmt.load(f)
 
 
@@ -42,7 +42,7 @@ class DelimitingParser:
 
         self._db = DelimitingBuffer(delimiters)
 
-    def parse(self, b: bytes) -> ta.Generator[ta.Any]:
+    def parse(self, b: bytes) -> ta.Iterator[ta.Any]:
         for chunk in self._db.feed(b):
             s = check.isinstance(chunk, bytes).decode('utf-8')
             v = self._fmt.load(io.StringIO(s))
@@ -58,7 +58,7 @@ class StreamBuilder(lang.ExitStacked):
     def _enter_contexts(self) -> None:
         self._builder = self._enter_context(JsonValueBuilder())
 
-    def build(self, e: JsonStreamParserEvent) -> ta.Generator[ta.Any]:
+    def build(self, e: Event) -> ta.Iterator[ta.Any]:
         yield from check.not_none(self._builder)(e)
 
 
@@ -72,7 +72,7 @@ class StreamParser(lang.ExitStacked):
         self._lex = self._enter_context(JsonStreamLexer())
         self._parse = self._enter_context(JsonStreamParser())
 
-    def parse(self, b: bytes) -> ta.Generator[JsonStreamParserEvent]:
+    def parse(self, b: bytes) -> ta.Iterator[Event]:
         for s in self._decoder.decode(b, not b):
             for c in s:
                 for t in self._lex(c):

omdev/tools/json/rendering.py

@@ -4,7 +4,7 @@ import typing as ta
 
 from omlish import lang
 from omlish.formats.json.rendering import JsonRenderer
-from omlish.formats.json.stream.parsing import JsonStreamParserEvent
+from omlish.formats.json.stream.parsing import Event
 from omlish.formats.json.stream.rendering import StreamJsonRenderer
 from omlish.formats.json5.rendering import Json5Renderer
 from omlish.term import codes as tc
@@ -101,5 +101,5 @@ class StreamRenderer(Renderer):
             **self._kw,
         )
 
-    def render(self, e: JsonStreamParserEvent) -> ta.Generator[str]:
+    def render(self, e: Event) -> ta.Iterator[str]:
         return self._renderer.render((e,))

{omdev-0.0.0.dev438.dist-info → omdev-0.0.0.dev439.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev438
+Version: 0.0.0.dev439
 Summary: omdev
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,7 +14,7 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev438
+Requires-Dist: omlish==0.0.0.dev439
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.23; extra == "all"
@@ -23,7 +23,7 @@ Requires-Dist: docutils~=0.22; extra == "all"
 Requires-Dist: markdown-it-py~=4.0; extra == "all"
 Requires-Dist: mdit-py-plugins~=0.5; extra == "all"
 Requires-Dist: pygments~=2.19; extra == "all"
-Requires-Dist: mypy~=1.17; extra == "all"
+Requires-Dist: mypy~=1.18; extra == "all"
 Requires-Dist: gprof2dot~=2025.4; extra == "all"
 Requires-Dist: prompt-toolkit~=3.0; extra == "all"
 Requires-Dist: segno~=1.6; extra == "all"
@@ -38,7 +38,7 @@ Requires-Dist: markdown-it-py~=4.0; extra == "doc"
 Requires-Dist: mdit-py-plugins~=0.5; extra == "doc"
 Requires-Dist: pygments~=2.19; extra == "doc"
 Provides-Extra: mypy
-Requires-Dist: mypy~=1.17; extra == "mypy"
+Requires-Dist: mypy~=1.18; extra == "mypy"
 Provides-Extra: prof
 Requires-Dist: gprof2dot~=2025.4; extra == "prof"
 Provides-Extra: ptk

{omdev-0.0.0.dev438.dist-info → omdev-0.0.0.dev439.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omdev/.omlish-manifests.json,sha256=YvmHgYPueZ-uG4KeZAk0bOtw3GaDfld_nYnSng2Pz_I,11909
-omdev/__about__.py,sha256=x-dVL4rAhU7f3I8Y98CN8oHwxcqwEF3-W9KA4dBmdTc,1202
+omdev/__about__.py,sha256=jGBKcjGKlquwFQNwnAR0Yoglh8h8UZ0Nh7h46HIXTTQ,1202
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/cmake.py,sha256=gu49t10_syXh_TUJs4POsxeFs8we8Y3XTOOPgIXmGvg,4608
 omdev/imgur.py,sha256=oqei705LhSnLWQTOMHMHwRecRXcpSEP90Sg4SVINPQ0,3133
@@ -15,7 +15,7 @@ omdev/amalg/gen/gen.py,sha256=95iQT0At_NsMf4IEg702ZOmmyEdhCZJGcSCFypm1BTk,6194
 omdev/amalg/gen/imports.py,sha256=Bv3xNgej1Nsuv5R_y-9wd9b8cPtWljZsxjMh9bolJWc,2074
 omdev/amalg/gen/manifests.py,sha256=SN4wvPZ8iNTcQIdpSZ6d64cL32pSlT_ak_GwctTPn_Y,903
 omdev/amalg/gen/resources.py,sha256=wxqrudGbHzru2KWu-a_4LDmOf7tRRCd8NM0BXx_ZU9I,2693
-omdev/amalg/gen/srcfiles.py,sha256=UUAW2XtzaMv6-ACr364gyAxa-W3bAawRIwTiXE3-ndQ,3080
+omdev/amalg/gen/srcfiles.py,sha256=50HAAzsrJi-mV2r2Q1eQUJNgoSSP8qqe1xcaUN1GTRA,3506
 omdev/amalg/gen/strip.py,sha256=GW76ZWJNdwH8dxLDG7gVHFi_CnS958fWvSfroD0HCaw,1446
 omdev/amalg/gen/types.py,sha256=DvxUmEenqCeXycRHi4brxAkSjztq800qT1XlT94bXAY,90
 omdev/amalg/gen/typing.py,sha256=VWw4_iZXqM_29ElSVUlLTO6-KLUCQPdieQDvG_q1YsI,2301
@@ -274,14 +274,16 @@ omdev/pyproject/resources/docker-dev.sh,sha256=DHkz5D18jok_oDolfg2mqrvGRWFoCe9GQ
 omdev/pyproject/resources/python.sh,sha256=rFaN4SiJ9hdLDXXsDTwugI6zsw6EPkgYMmtacZeTbvw,749
 omdev/scripts/__init__.py,sha256=MKCvUAEQwsIvwLixwtPlpBqmkMXLCnjjXyAXvVpDwVk,91
 omdev/scripts/ci.py,sha256=53xZyiwiMQpi8dh4I5Fs_HjIgF_QcOGkKLmI7goPrF4,423536
+omdev/scripts/inject.py,sha256=b0D8HbPALRwtg2r5T6B1UutTkQvVQm-58zT6uHPVjxQ,53700
 omdev/scripts/interp.py,sha256=-mZ0RUnDiq-798F_HDt1OQG8k0hiWbSmaR8iepuwfyo,166643
+omdev/scripts/marshal.py,sha256=scyQMuEKzEejoe8eC2wZLCS57CTVQ8RS58UxKiSLD90,46832
 omdev/scripts/pyproject.py,sha256=YAM8FbJ6dV0gAGFchRajPqmL0gpQc1S8uKxdQjaIay8,330699
 omdev/scripts/slowcat.py,sha256=PwdT-pg62imEEb6kcOozl9_YUi-4KopvjvzWT1OmGb0,2717
 omdev/scripts/tmpexec.py,sha256=t0nErDRALjTk7H0X8ADjZUIDFjlPNzOOokmjCjBHdzs,1431
 omdev/tokens/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tokens/all.py,sha256=Zz7miOWeBDYfOEgKyeIGHooLvr9r31HlI04eqYWBUpU,806
 omdev/tokens/tokenizert.py,sha256=BvDjXjaeM3_sMq9i-oojuKcAuGzSkbCso-Yt-gNKxeQ,7910
-omdev/tokens/utils.py,sha256=6dey8Oh78cIWqhGh7zfW3cmZjnBZPRpR8FQ8ntwAz9A,2014
+omdev/tokens/utils.py,sha256=_dlXx-_npiGeZkMZVbXaXQDGts9yY8UnEJcT_bwPj0A,2084
 omdev/tools/__init__.py,sha256=iVJAOQ0viGTQOm0DLX4uZLro-9jOioYJGLg9s0kDx1A,78
 omdev/tools/cloc.py,sha256=BiIf2PnnoRH6ByH4mnua69Vv-ZDPHsSAPUds7giRolI,6013
 omdev/tools/diff.py,sha256=S6ddB7pBeMtzKh2hiHfzQ93pj6mclKt1UZQMKy4Bt5M,520
@@ -304,12 +306,12 @@ omdev/tools/git/consts.py,sha256=JuXivUNDkNhM4pe97icjRVAKM8cNRbrODquHINNKqOE,40
 omdev/tools/git/messages.py,sha256=R39pXfXt8394eC99rpTdRlbcMrAdLxwsgTR4pwRRa-o,2321
 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=8aXX3ijU3lvPZamkIyUOz-vlBmyIdaX7dCQq5rN7adE,10193
+omdev/tools/json/cli.py,sha256=d7i5aPsFGIfHirY1U845t7gARpy3mu1YtvYa-qBkQF4,10142
 omdev/tools/json/formats.py,sha256=1qGYb8Kq_yFpLMaecBg-XE3yWSvqRiRbBX8SAElpS9s,2643
 omdev/tools/json/io.py,sha256=sfj2hJS9Hy3aUR8a_lLzOrYcmL9fSKyvOHiofdUASsI,1427
-omdev/tools/json/parsing.py,sha256=xZiOH3jSVErNGKI8AysFf0zzyhivXvRakTQe7rWxhKQ,2052
+omdev/tools/json/parsing.py,sha256=R7h-UkwFm3Q0L8oHTk-aLtQN6x32-vkDXwLUxExL0tI,2000
 omdev/tools/json/processing.py,sha256=jMSkTmIccdVkT_Q6Jf8Q4AG4BQecQfrp8G2bEtsklg8,2387
-omdev/tools/json/rendering.py,sha256=TXNP8KBWN-zT2nx0_LArdd6Wmff550hw-RyuB4Ydcjc,2661
+omdev/tools/json/rendering.py,sha256=dsZki-47lPuYP_-x7gFFl57IZnCJUXHS-NBGpQZjvk0,2628
 omdev/tools/jsonview/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/tools/jsonview/__main__.py,sha256=BF-MVWpPJJeQYUqJA48G395kxw0lEJnV-hRLV_F9G2A,173
 omdev/tools/jsonview/cli.py,sha256=8pHULS_xxDV00kM8bO5dLH7i-zqQIoNjXTKFwhxSZ_A,4245
@@ -319,9 +321,9 @@ omdev/tools/jsonview/resources/jsonview.js,sha256=faDvXDOXKvEvjOuIlz4D3F2ReQXb_b
 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=ao5mdrpiSU4AZ8mBozoEaV3UVlmVTnRG9wD9XP70MZE,11429
-omdev-0.0.0.dev438.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev438.dist-info/METADATA,sha256=2eVH24yBOJALi20wAIqt8hZRAJt7md-KkFPqwcKQwG0,5100
-omdev-0.0.0.dev438.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omdev-0.0.0.dev438.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev438.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev438.dist-info/RECORD,,
+omdev-0.0.0.dev439.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev439.dist-info/METADATA,sha256=Efv8gVlchv6Cw6-DQgiYobMfsQxRRczgHoaMsQu2kRo,5100
+omdev-0.0.0.dev439.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omdev-0.0.0.dev439.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev439.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev439.dist-info/RECORD,,