omdev 0.0.0.dev359__py3-none-any.whl → 0.0.0.dev361__py3-none-any.whl

omdev/.manifests.json

@@ -39,7 +39,7 @@
     "module": ".cli.clicli",
     "attr": "_CLI_MODULE",
     "file": "omdev/cli/clicli.py",
-    "line": 229,
+    "line": 233,
     "value": {
       "$.cli.types.CliModule": {
         "cmd_name": "cli",

omdev/cli/clicli.py

@@ -133,9 +133,10 @@ class CliCli(ap.Cli):
                 ])
 
                 if self.args.no_uv:
-                    pip_cmd = [
+                    pip_install_cmd = [
                         venv_exe,
                         '-m', 'pip',
+                        'install',
                     ]
                 else:
                     subprocess.check_call([
@@ -144,25 +145,28 @@ class CliCli(ap.Cli):
                         'install',
                         'uv',
                     ])
-                    pip_cmd = [
+                    pip_install_cmd = [
                         venv_exe,
                         '-m', 'uv',
                         'pip',
+                        'install',
+                        '--refresh',
                     ]
 
                 subprocess.check_call([
-                    *pip_cmd,
-                    'install',
+                    *pip_install_cmd,
                     '--dry-run',
                     f'{install.DEFAULT_CLI_PKG}=={target_version}',
                     *deps,
                 ])
 
-                print('Pip install check successful')
+                print('venv install check successful')
 
         else:
             print('venv not present, cannot check install')
 
+        print()
+
         #
 
         if deps:

omdev/tools/json/cli.py

@@ -98,6 +98,7 @@ def _build_args_parser() -> argparse.ArgumentParser:
     parser.add_argument('-U', '--unicode', action='store_true')
     parser.add_argument('-c', '--color', action='store_true')
     parser.add_argument('-5', '--five', action='store_true')
+    parser.add_argument('-W', '--softwrap', type=int)
 
     parser.add_argument('-L', '--less', action='store_true')
 
@@ -161,6 +162,7 @@ def _process_args(args: ta.Any) -> RunConfiguration:
         unicode=args.unicode,
         color=args.color,
         five=args.five,
+        softwrap_length=args.softwrap,
     )
 
     #

omdev/tools/json/formats.py

@@ -23,6 +23,8 @@ if ta.TYPE_CHECKING:
     from omlish.formats import json5
     from omlish.formats import props
     from omlish.formats import xml
+    from omlish.formats.json import stream as json_stream
+    from omlish.formats.json5 import parsing as json5_parsing
 
 else:
     ast = lang.proxy_import('ast')
@@ -35,6 +37,8 @@ else:
     json5 = lang.proxy_import('omlish.formats.json5')
     props = lang.proxy_import('omlish.formats.props')
     xml = lang.proxy_import('omlish.formats.xml')
+    json_stream = lang.proxy_import('omlish.formats.json.stream')
+    json5_parsing = lang.proxy_import('omlish.formats.json5.parsing')
 
 
 ##
@@ -46,6 +50,14 @@ class Format:
     load: ta.Callable[[ta.TextIO], ta.Any]
 
 
+def _load_jsons(f: ta.TextIO) -> list[ta.Any]:
+    return list(json_stream.stream_parse_values(f.read()))
+
+
+def _load_json5s(f: ta.TextIO) -> list[ta.Any]:
+    return list(json5_parsing.parse_many(f.read()))
+
+
 def _load_xml(f: ta.TextIO) -> dict[str, ta.Any]:
     tree = xml.parse_tree(f.read())
     sel = xml.build_simple_element(check.not_none(tree.getroot()))
@@ -57,6 +69,9 @@ class Formats(enum.Enum):
 
     JSON5 = Format(['json5'], lambda f: json5.loads(f.read()))
 
+    JSON_STREAM = Format(['jsons'], lambda f: _load_jsons(f))
+    JSON5_STREAM = Format(['json5s'], lambda f: _load_json5s(f))
+
     YAML = Format(['yaml', 'yml'], lambda f: yaml.safe_load(f))
 
     TOML = Format(['toml'], lambda f: tomllib.loads(f.read()))

omdev/tools/json/parsing.py

@@ -4,7 +4,7 @@ import typing as ta
 
 from omlish import check
 from omlish import lang
-from omlish.formats.json.stream.building import JsonObjectBuilder
+from omlish.formats.json.stream.building import JsonValueBuilder
 from omlish.formats.json.stream.lexing import JsonStreamLexer
 from omlish.formats.json.stream.parsing import JsonStreamParser
 from omlish.formats.json.stream.parsing import JsonStreamParserEvent
@@ -53,10 +53,10 @@ class DelimitingParser:
 
 
 class StreamBuilder(lang.ExitStacked):
-    _builder: JsonObjectBuilder | None = None
+    _builder: JsonValueBuilder | None = None
 
     def _enter_contexts(self) -> None:
-        self._builder = self._enter_context(JsonObjectBuilder())
+        self._builder = self._enter_context(JsonValueBuilder())
 
     def build(self, e: JsonStreamParserEvent) -> ta.Generator[ta.Any]:
         yield from check.not_none(self._builder)(e)

omdev/tools/json/rendering.py

@@ -22,6 +22,7 @@ class RenderingOptions:
     unicode: bool = False
     color: bool = False
     five: bool = False
+    softwrap_length: int | None = None
 
 
 def make_render_kwargs(opts: RenderingOptions) -> ta.Mapping[str, ta.Any]:
@@ -69,6 +70,7 @@ class EagerRenderer(Renderer):
                 **self._kw,
                 **(dict(style=term_color) if self._opts.color else {}),
                 multiline_strings=True,
+                softwrap_length=self._opts.softwrap_length,
             )
 
         elif self._opts.color:

{omdev-0.0.0.dev359.dist-info → omdev-0.0.0.dev361.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omdev
-Version: 0.0.0.dev359
+Version: 0.0.0.dev361
 Summary: omdev
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: >=3.13
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev359
+Requires-Dist: omlish==0.0.0.dev361
 Provides-Extra: all
 Requires-Dist: black~=25.1; extra == "all"
 Requires-Dist: pycparser~=2.22; extra == "all"

{omdev-0.0.0.dev359.dist-info → omdev-0.0.0.dev361.dist-info}/RECORD

@@ -1,4 +1,4 @@
-omdev/.manifests.json,sha256=TxFQlZtjISs_Uqe9FOVW7nXjHDu2QE5HJ2wbx4KqKX0,11870
+omdev/.manifests.json,sha256=gUmQyNfvds3Q_9p7PzDJGfOrUUkPWOUN0c_K_9uRPs4,11870
 omdev/__about__.py,sha256=2_6pQyjxqAspvwBSJUWQgdBBcGaDO3zX8yETLaspUQE,1202
 omdev/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omdev/cmake.py,sha256=9rfSvFHPmKDj9ngvfDB2vK8O-xO_ZwUm7hMKLWA-yOw,4578
@@ -103,7 +103,7 @@ omdev/ci/github/api/v2/client.py,sha256=bJtL_TZ4sB6IDuzfqtEXj-iWivKfyXQZ_MO30lgB
 omdev/cli/__init__.py,sha256=V_l6VP1SZMlJbO-8CJwSuO9TThOy2S_oaPepNYgIrbE,37
 omdev/cli/__main__.py,sha256=mOJpgc07o0r5luQ1DlX4tk2PqZkgmbwPbdzJ3KmtjgQ,138
 omdev/cli/_pathhack.py,sha256=UshIZX3oeXq0De-9X28gy2LgKMZDf_dzabdkUhZJdNA,2124
-omdev/cli/clicli.py,sha256=0rbRfD1WgUr8SIHhh22VLdirnJbveSPox5raFKdWQxM,6190
+omdev/cli/clicli.py,sha256=TZnQYHyyh97B6N_pVYYduYgt03s8Yp5mrJ7wblXWSWY,6308
 omdev/cli/install.py,sha256=oB34AOwu07sqEztW_z5mgorAFoP_Tw556XiTPj2WSM0,4904
 omdev/cli/main.py,sha256=dxZFyzKuwRykHHhoKKUA0fUa9QsY0dgdvLHbXNuIPCY,6694
 omdev/cli/managers.py,sha256=BV98_n30Jj63OJrFgRoVZRfICxMLXEZKoEn4rMj9LV4,1160
@@ -288,12 +288,12 @@ omdev/tools/git/consts.py,sha256=JuXivUNDkNhM4pe97icjRVAKM8cNRbrODquHINNKqOE,40
 omdev/tools/git/messages.py,sha256=NWztIK0nAKJIOVzuVQcR_5LHZUgqyVkrOlpl7dFLMdU,2424
 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=EivaqeBlHNzrOYkSUvvxDUia0TuyS4KPtxrPxvfqFi8,9994
-omdev/tools/json/formats.py,sha256=0IXHUIkcbKnTVP0a53wYWsBMpfVtGTrHN04zRAs2JZo,2049
+omdev/tools/json/cli.py,sha256=v8YsChDN97y7XDsNRs3zimCAwCkJQkMDcd8CXhfUVGY,10087
+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=fBqPEmeQAbqSfq2Wuu-0xT1Jr6aTB0SM_KMtaZb7Z_8,2055
+omdev/tools/json/parsing.py,sha256=xZiOH3jSVErNGKI8AysFf0zzyhivXvRakTQe7rWxhKQ,2052
 omdev/tools/json/processing.py,sha256=KVMVyW5dTaoPyjn2Aabkay4tBn5cwJJXtLQaJgZI7ZY,2016
-omdev/tools/json/rendering.py,sha256=gCVjNrgfaZoviJNWU8j7Pq4sz1EHYjOxsshC6OxWwDE,2561
+omdev/tools/json/rendering.py,sha256=KilwK8ziHGy3Z76H9CC04x2ro5Rkws1d06D0j6TnHA4,2660
 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
@@ -303,9 +303,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=zsEkfQX0jF5bn712uqPAyBSdJt2dno1LH2oeSMNfXQI,11424
-omdev-0.0.0.dev359.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev359.dist-info/METADATA,sha256=Zd6Fn57CVD05yrwO3YobHVqgsabQ9Ved9abAQ-Rd_4I,1674
-omdev-0.0.0.dev359.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omdev-0.0.0.dev359.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev359.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev359.dist-info/RECORD,,
+omdev-0.0.0.dev361.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev361.dist-info/METADATA,sha256=RwOgZ_VgNHtw7VEnM8WzMwzobN3T2jeZzqUDrrkv_7Y,1674
+omdev-0.0.0.dev361.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omdev-0.0.0.dev361.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev361.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev361.dist-info/RECORD,,