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

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev346'
-__revision__ = '22379be8a53062cec833d7d5e73c8d5580cf26e4'
+__version__ = '0.0.0.dev348'
+__revision__ = '9221487d58c929807a19dfe3fbba6bf334f1a942'
 
 
 #

omlish/formats/json/literals.py

@@ -56,10 +56,26 @@ def _convert_to_string(s: str | bytes) -> str:
         return s
 
 
+def _handle_encode_quote_args(
+        q: str | None,
+        lq: str | None,
+        rq: str | None,
+) -> tuple[str, str]:
+    if q is None:
+        q = '"'
+    if lq is None:
+        lq = q
+    if rq is None:
+        rq = q
+    return (lq, rq)
+
+
 def encode_string(
         s: str | bytes,
-        q: str = '"',
+        q: str | None = None,
         *,
+        lq: str | None = None,
+        rq: str | None = None,
         escape_map: ta.Mapping[str, str] | None = None,
 ) -> str:
     """Return a JSON representation of a Python string."""
@@ -72,13 +88,21 @@ def encode_string(
     def replace(m):
         return escape_map[m.group(0)]
 
-    return q + _ESCAPE_PAT.sub(replace, s) + q
+    lq, rq = _handle_encode_quote_args(q, lq, rq)
+
+    return ''.join([
+        lq,
+        _ESCAPE_PAT.sub(replace, s),
+        rq,
+    ])
 
 
 def encode_string_ascii(
         s: str | bytes,
-        q: str = '"',
+        q: str | None = None,
         *,
+        lq: str | None = None,
+        rq: str | None = None,
         escape_map: ta.Mapping[str, str] | None = None,
 ) -> str:
     """Return an ASCII-only JSON representation of a Python string."""
@@ -105,7 +129,13 @@ def encode_string_ascii(
             s2 = 0xDC00 | (n & 0x3FF)
             return f'\\u{s1:04x}\\u{s2:04x}'
 
-    return q + str(_ESCAPE_ASCII_PAT.sub(replace, s)) + q
+    lq, rq = _handle_encode_quote_args(q, lq, rq)
+
+    return ''.join([
+        lq,
+        str(_ESCAPE_ASCII_PAT.sub(replace, s)),
+        rq,
+    ])
 
 
 ##

omlish/formats/json/rendering.py

@@ -77,7 +77,7 @@ class AbstractJsonRenderer(lang.Abstract, ta.Generic[I]):
         self._indent_cache[self._level] = ret
         return ret
 
-    def _format_scalar(self, o: Scalar) -> str:
+    def _format_scalar(self, o: Scalar, state: State | None = None) -> str:
         if o is None or isinstance(o, bool):
             return self._literals[o]
 
@@ -129,7 +129,13 @@ class JsonRenderer(AbstractJsonRenderer[ta.Any]):
             post = None
 
         if isinstance(o, SCALAR_TYPES):
-            self._write(self._format_scalar(o))  # type: ignore
+            # FIXME: `less` workaround, doesn't carry color code across newlines
+            # f = self._format_scalar(o, state)
+            # if isinstance(o, str) and '\n' in f and self._style is not None and pre:
+            #     f = f'\n{pre}'.join(f.split('\n'))
+            # self._write(f)
+
+            self._write(self._format_scalar(o, state))  # type: ignore[arg-type]
 
         elif isinstance(o, ta.Mapping):
             self._write('{')

omlish/formats/json5/rendering.py

@@ -29,16 +29,21 @@ class Json5Renderer(JsonRenderer):
 
         self._multiline_strings = multiline_strings
 
-    def _format_scalar(self, o: Scalar) -> str:
+    def _format_scalar(self, o: Scalar, state: JsonRenderer.State | None = None) -> str:
         if (
                 self._multiline_strings and
                 isinstance(o, str) and
                 '\n' in o
         ):
+            kw: dict = dict(
+                escape_map=MULTILINE_STRINGS_ESCAPE_MAP,
+                lq='"\\\n',
+            )
+
             if self._ensure_ascii:
-                return encode_string_ascii(o, escape_map=MULTILINE_STRINGS_ESCAPE_MAP)
+                return encode_string_ascii(o, **kw)
             else:
-                return encode_string(o, escape_map=MULTILINE_STRINGS_ESCAPE_MAP)
+                return encode_string(o, **kw)
 
         else:
             return super()._format_scalar(o)

omlish/specs/jmespath/visitor.py

@@ -1,3 +1,7 @@
+"""
+TODO:
+ - cext?
+"""
 import numbers
 import operator
 import typing as ta

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: omlish
-Version: 0.0.0.dev346
+Version: 0.0.0.dev348
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

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

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=orgsRvtpHu8tdhaCvlP9v3P495OJopYYiHKjK68WtWg,8587
-omlish/__about__.py,sha256=v1uCf71x36T3T0yERINIvFHOFBExfNLZcZ3_CSeZdKc,3478
+omlish/__about__.py,sha256=VPo5EP7eKAN0kzg-6HJR4oMaz9fJ8yfitXPyfJ9iFDU,3478
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=rer-TPOFDU6fYq_AWio_AmA-ckZ8JDY5shIzQ_yXfzA,8414
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -265,8 +265,8 @@ omlish/formats/json/__init__.py,sha256=i41uhoyXjuLjj5JmdRj4Ud2sfKD0j6KAyk_XyyCIB
 omlish/formats/json/codecs.py,sha256=wvPHZw8cDHaOV6u7e9rfpCH3JVF_IjA6ND_fQUhcCXU,844
 omlish/formats/json/consts.py,sha256=A0cTAGGLyjo-gcYIQrL4JIaardI0yPMhQoNmh42BaRg,387
 omlish/formats/json/encoding.py,sha256=iwoYyJePibgvRDZ6e9b2OlXmOBJEczquRNoiffVf3hE,502
-omlish/formats/json/literals.py,sha256=MMou9UIoztL9EyX2Zhv3Kzfq8eaKMfGNCFhL16n-fTk,7532
-omlish/formats/json/rendering.py,sha256=0S_ppr5ihkUW7PP0mipZXHr72otqwUCNfanwopcboag,4571
+omlish/formats/json/literals.py,sha256=sJb4c1FhM9Ms0c0suByMA5i7WXI-pSLsmnPVaQd-qCw,8106
+omlish/formats/json/rendering.py,sha256=5p8kG1t3aGm2GXsb82h1S90Mmz4lzbX8sX9_qh7fH1U,4915
 omlish/formats/json/types.py,sha256=ueO9-uOU2eVWowJf0LH1fHFLjZ6fTIZyq9qybcLQaiQ,147
 omlish/formats/json/backends/__init__.py,sha256=K5nAP-fCgUvaSylHqgRvmJp6j6PTWdMjrNhvMouKrFc,161
 omlish/formats/json/backends/base.py,sha256=WqtyoM82pyM0NyqpPwndrebr1bUVU1QlpmVQNrcAO8c,1114
@@ -288,7 +288,7 @@ omlish/formats/json5/codec.py,sha256=ldnxCRo0JP1fkGLt0mMxJlLvNxqIF_1KUCcSp1HtI-M
 omlish/formats/json5/errors.py,sha256=AHkR9ySjAoQdUrizpqgL8fg0M5oe5mHZkml3KZHEvC4,38
 omlish/formats/json5/literals.py,sha256=rj4-9KFXfgdq5oK_eUkp57cgoMQ8T0gRaG9ga430he4,2429
 omlish/formats/json5/parsing.py,sha256=CWJHfe_FXCQuyDk00a7PI5wOdROq7Tc3fbWrNuwaKCw,2346
-omlish/formats/json5/rendering.py,sha256=Kf-yA4AB3BqyjellBOFTGrMxxpIUsmgHIFzVRSJkQnE,1112
+omlish/formats/json5/rendering.py,sha256=tHo-Zrb5obxNFgz4PAg-L1IU4El_4Pu8F-eoPj5XARY,1212
 omlish/formats/json5/_antlr/Json5Lexer.py,sha256=LnURBD0tL35VHNpxqM4DOPrTkE_9oONHtbftRM26tak,23239
 omlish/formats/json5/_antlr/Json5Listener.py,sha256=37Jhzu7tQEw6gLIxtcZtV5Yjn08kS-GkxF7d0KjXyo8,2097
 omlish/formats/json5/_antlr/Json5Parser.py,sha256=YU9bP89nq97A8ZCrjIcbgoBg4z76-N-6IMFGQe_ws54,19679
@@ -625,7 +625,7 @@ omlish/specs/jmespath/functions.py,sha256=YnuwlgkcbUJWlqOvSpN3LGXZpF0fpImKa--FLk
 omlish/specs/jmespath/lexer.py,sha256=WGxkwQe_dcHWcJcGg9q6K-8_Q0oRdWkw09dYGFNTHbk,12639
 omlish/specs/jmespath/parser.py,sha256=yfkydotVR4LBhrUTsptL_kLYDoGZrRN9zSEs_76kvZM,24441
 omlish/specs/jmespath/scope.py,sha256=UyDsl9rv_c8DCjJBuVIA2ESu1jrgYvuwEKiaJDQKnT0,1590
-omlish/specs/jmespath/visitor.py,sha256=HVro_6aBGL0CMBy8NRy6vJzWgwsHGB1qJXldX8H7wSg,16592
+omlish/specs/jmespath/visitor.py,sha256=J1vI5WMt8v0TxCXz1EfeU_Po-t-RxaqeoSoOeL99TxE,16615
 omlish/specs/jsonrpc/__init__.py,sha256=ugIdqHXWZjSy1R1SkwoxstO2GCHEF4W95Ogl3_5_DV4,544
 omlish/specs/jsonrpc/conns.py,sha256=zvWnBHuSoGnvbGVk72Usp4IFsLscrzPozqR2hmFjnDI,7029
 omlish/specs/jsonrpc/errors.py,sha256=-Zgmlo6bV6J8w5f8h9axQgLquIFBHDgIwcpufEH5NsE,707
@@ -864,9 +864,9 @@ omlish/typedvalues/marshal.py,sha256=AtBz7Jq-BfW8vwM7HSxSpR85JAXmxK2T0xDblmm1HI0
 omlish/typedvalues/of_.py,sha256=UXkxSj504WI2UrFlqdZJbu2hyDwBhL7XVrc2qdR02GQ,1309
 omlish/typedvalues/reflect.py,sha256=PAvKW6T4cW7u--iX80w3HWwZUS3SmIZ2_lQjT65uAyk,1026
 omlish/typedvalues/values.py,sha256=ym46I-q2QJ_6l4UlERqv3yj87R-kp8nCKMRph0xQ3UA,1307
-omlish-0.0.0.dev346.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev346.dist-info/METADATA,sha256=tGdSN_DIuDhQAq4ducgWC8yO4_ys4aFIlMZhJESAQFA,4416
-omlish-0.0.0.dev346.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-omlish-0.0.0.dev346.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev346.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev346.dist-info/RECORD,,
+omlish-0.0.0.dev348.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev348.dist-info/METADATA,sha256=keSC0b7sKQuzPGKZZOOvIvBbQGN0650E6LUOdMyB4GY,4416
+omlish-0.0.0.dev348.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+omlish-0.0.0.dev348.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev348.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev348.dist-info/RECORD,,