omdev 0.0.0.dev346__py3-none-any.whl → 0.0.0.dev348__py3-none-any.whl

omdev/tools/json/cli.py

@@ -84,6 +84,7 @@ def _build_args_parser() -> argparse.ArgumentParser:
 
     parser.add_argument('-x', '--jmespath-expr')
     parser.add_argument('-F', '--flat', action='store_true')
+    parser.add_argument('-E', '--omit-empty', action='store_true')
 
     parser.add_argument('-z', '--compact', action='store_true')
     parser.add_argument('-p', '--pretty', action='store_true')
@@ -92,6 +93,7 @@ def _build_args_parser() -> argparse.ArgumentParser:
     parser.add_argument('-R', '--raw', action='store_true')
     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('-L', '--less', action='store_true')
 
@@ -128,6 +130,7 @@ def _process_args(args: ta.Any) -> RunConfiguration:
     processing = ProcessingOptions(
         jmespath_expr=args.jmespath_expr,
         flat=args.flat,
+        omit_empty=args.omit_empty,
     )
 
     #
@@ -152,6 +155,7 @@ def _process_args(args: ta.Any) -> RunConfiguration:
         raw=args.raw,
         unicode=args.unicode,
         color=args.color,
+        five=args.five,
     )
 
     #

omdev/tools/json/processing.py

@@ -17,6 +17,7 @@ else:
 class ProcessingOptions:
     jmespath_expr: ta.Any | None = None
     flat: bool = False
+    omit_empty: bool = False
 
 
 class Processor:
@@ -34,6 +35,7 @@ class Processor:
         if self._jmespath_expr is not None:
             v = self._jmespath_expr.search(v)
 
+        vs: ta.Iterable[ta.Any]
         if self._opts.flat:
             if (
                     not isinstance(v, ta.Iterable) or  # noqa
@@ -42,7 +44,14 @@ class Processor:
             ):
                 raise TypeError(f'Flat output must be flat collections, got {type(v)}', v)
 
-            yield from v
+            vs = v
 
         else:
+            vs = [v]
+
+        for v in vs:
+            if self._opts.omit_empty:
+                if v is None or (isinstance(v, (ta.Sequence, ta.Mapping)) and not v):
+                    continue
+
             yield v

omdev/tools/json/rendering.py

@@ -6,6 +6,7 @@ from omlish import lang
 from omlish.formats.json.rendering import JsonRenderer
 from omlish.formats.json.stream.parsing import JsonStreamParserEvent
 from omlish.formats.json.stream.rendering import StreamJsonRenderer
+from omlish.formats.json5.rendering import Json5Renderer
 from omlish.term import codes as tc
 
 
@@ -20,6 +21,7 @@ class RenderingOptions:
     raw: bool = False
     unicode: bool = False
     color: bool = False
+    five: bool = False
 
 
 def make_render_kwargs(opts: RenderingOptions) -> ta.Mapping[str, ta.Any]:
@@ -61,6 +63,14 @@ class EagerRenderer(Renderer):
 
             return v
 
+        elif self._opts.five:
+            return Json5Renderer.render_str(
+                v,
+                **self._kw,
+                **(dict(style=term_color) if self._opts.color else {}),
+                multiline_strings=True,
+            )
+
         elif self._opts.color:
             return JsonRenderer.render_str(
                 v,

omdev/tools/jsonview/cli.py

@@ -1,3 +1,12 @@
+"""
+TODO:
+ - read from stdin
+ - evaluate jmespath on server using extended engine
+ - integrate with json tool
+ - use omlish server and templates
+ - vendor deps, serve local
+ - update to https://github.com/josdejong/svelte-jsoneditor
+"""
 import argparse
 import http.server
 import json

omdev/tools/jsonview/resources/jsonview.css

@@ -7,6 +7,7 @@ html, body {
     flex-direction: column;
     font-family: sans-serif;
 }
+
 .input-area {
     padding: 10px;
     display: flex;
@@ -15,6 +16,7 @@ html, body {
     border-bottom: 1px solid #ccc;
     flex-shrink: 0;
 }
+
 #jmespath-input {
     flex-grow: 1;
     padding: 8px;
@@ -22,11 +24,14 @@ html, body {
     border-radius: 4px;
     font-size: 14px;
 }
+
 #error-message {
     color: red;
     font-size: 14px;
     white-space: nowrap;
 }
+
 #jsoneditor {
     flex-grow: 1;
+    overflow: auto;
 }

{omdev-0.0.0.dev346.dist-info → omdev-0.0.0.dev348.dist-info}/METADATA

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

{omdev-0.0.0.dev346.dist-info → omdev-0.0.0.dev348.dist-info}/RECORD

@@ -288,24 +288,24 @@ 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=WQ8VQ9EkGD6IeIuUci8hLPwfx6y2B8ZzFlTTizwwKXU,9598
+omdev/tools/json/cli.py,sha256=GLRg1dz_Y7HEzBtpiLWDZxmuqALMG3--22GFLyaQfl4,9786
 omdev/tools/json/formats.py,sha256=0IXHUIkcbKnTVP0a53wYWsBMpfVtGTrHN04zRAs2JZo,2049
 omdev/tools/json/io.py,sha256=sfj2hJS9Hy3aUR8a_lLzOrYcmL9fSKyvOHiofdUASsI,1427
 omdev/tools/json/parsing.py,sha256=csoTuG2C2AJB7PgG4TKt2XqdiBAQXtpXRWBxoMkk14g,2103
-omdev/tools/json/processing.py,sha256=iFm5VqaxJ97WHaun2ed7NEjMxhFeJqf28bLNfoDJft0,1209
-omdev/tools/json/rendering.py,sha256=3HhdlKSetS6iK1tjF2aILzsl8Mb3D8wW92vYwGpRdVA,2244
+omdev/tools/json/processing.py,sha256=BKy385d86psrHVJGsu7U8_giUPUcU_R1s56u9v066VY,1461
+omdev/tools/json/rendering.py,sha256=t33eXnUoYTmusETBnrYrLCpkWLQNvkGmixudrd8C1ag,2573
 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=XU-knzWnIAeFL_g6PmE9FLdrXFSuFpOTNXC3KivH1zY,4008
+omdev/tools/jsonview/cli.py,sha256=8pHULS_xxDV00kM8bO5dLH7i-zqQIoNjXTKFwhxSZ_A,4245
 omdev/tools/jsonview/resources/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omdev/tools/jsonview/resources/jsonview.css,sha256=3pWHBd-NHONkhJzrHBxnlHtDq916Q6BWFJbnTuwJ32U,555
+omdev/tools/jsonview/resources/jsonview.css,sha256=RqQMm98EnQkbVM-8BgjNduzUfsVDMzgNC_NjjwG0bqI,579
 omdev/tools/jsonview/resources/jsonview.js,sha256=faDvXDOXKvEvjOuIlz4D3F2ReQXb_buXDU27hKuuqAw,1648
 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.dev346.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omdev-0.0.0.dev346.dist-info/METADATA,sha256=vP1PiHBd2-wIaE6dpVF49FPkbt8J0Fr3JGagbVukrZs,1674
-omdev-0.0.0.dev346.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omdev-0.0.0.dev346.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
-omdev-0.0.0.dev346.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
-omdev-0.0.0.dev346.dist-info/RECORD,,
+omdev-0.0.0.dev348.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omdev-0.0.0.dev348.dist-info/METADATA,sha256=3XnrSJqO59iNALGmqB8NZMrGvwyvRXdIl4SP0V2CTao,1674
+omdev-0.0.0.dev348.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omdev-0.0.0.dev348.dist-info/entry_points.txt,sha256=dHLXFmq5D9B8qUyhRtFqTGWGxlbx3t5ejedjrnXNYLU,33
+omdev-0.0.0.dev348.dist-info/top_level.txt,sha256=1nr7j30fEWgLYHW3lGR9pkdHkb7knv1U1ES1XRNVQ6k,6
+omdev-0.0.0.dev348.dist-info/RECORD,,