omdev 0.0.0.dev346__tar.gz → 0.0.0.dev348__tar.gz

{omdev-0.0.0.dev346/omdev.egg-info → omdev-0.0.0.dev348}/PKG-INFO

@@ -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 → omdev-0.0.0.dev348}/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-0.0.0.dev346 → omdev-0.0.0.dev348}/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-0.0.0.dev346 → omdev-0.0.0.dev348}/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-0.0.0.dev346 → omdev-0.0.0.dev348}/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-0.0.0.dev346 → omdev-0.0.0.dev348}/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 → omdev-0.0.0.dev348/omdev.egg-info}/PKG-INFO

@@ -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 → omdev-0.0.0.dev348}/omdev.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev346
+omlish==0.0.0.dev348
 
 [all]
 black~=25.1

{omdev-0.0.0.dev346 → omdev-0.0.0.dev348}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev346'
+version = '0.0.0.dev348'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omdev'
 dependencies = [
-    'omlish == 0.0.0.dev346',
+    'omlish == 0.0.0.dev348',
 ]
 
 [project.optional-dependencies]