omlish 0.0.0.dev360__py3-none-any.whl → 0.0.0.dev362__py3-none-any.whl

omlish/formats/json5/Json5.g4

@@ -1,4 +1,3 @@
-// Student Main
 // 2020-07-22
 // Public domain
 
@@ -79,18 +78,18 @@ fragment SINGLE_QUOTE_CHAR
 fragment ESCAPE_SEQUENCE
     : '\\' (
         NEWLINE
-        | UNICODE_SEQUENCE       // \u1234
-        | ['"\\/bfnrtv]          // single escape char
-        | ~['"\\bfnrtv0-9xu\r\n] // non escape char
-        | '0'                    // \0
-        | 'x' HEX HEX            // \x3a
+        | UNICODE_SEQUENCE        // \u1234
+        | ['"\\/bfnrtv]           // single escape char
+        | ~['"\\bfnrtv0-9xu\r\n]  // non escape char
+        | '0'                     // \0
+        | 'x' HEX HEX             // \x3a
     )
     ;
 
 NUMBER
-    : INT ('.' [0-9]*)? EXP? // +1.e2, 1234, 1234.5
-    | '.' [0-9]+ EXP?        // -.2e3
-    | '0' [xX] HEX+          // 0x12345678
+    : INT ('.' [0-9]*)? EXP?  // +1.e2, 1234, 1234.5
+    | '.' [0-9]+ EXP?         // -.2e3
+    | '0' [xX] HEX+           // 0x12345678
     ;
 
 NUMERIC_LITERAL

omlish/formats/json5/_antlr/Json5Lexer.py

@@ -1,6 +1,7 @@
 # type: ignore
 # ruff: noqa
 # flake8: noqa
+# @omlish-generated
 # Generated from Json5.g4 by ANTLR 4.13.2
 from ....text.antlr._runtime._all import *
 from io import StringIO

omlish/formats/json5/_antlr/Json5Listener.py

@@ -1,6 +1,7 @@
 # type: ignore
 # ruff: noqa
 # flake8: noqa
+# @omlish-generated
 # Generated from Json5.g4 by ANTLR 4.13.2
 from ....text.antlr._runtime._all import *
 if "." in __name__:

omlish/formats/json5/_antlr/Json5Parser.py

@@ -1,6 +1,7 @@
 # type: ignore
 # ruff: noqa
 # flake8: noqa
+# @omlish-generated
 # Generated from Json5.g4 by ANTLR 4.13.2
 # encoding: utf-8
 from ....text.antlr._runtime._all import *

omlish/formats/json5/_antlr/Json5Visitor.py

@@ -1,6 +1,7 @@
 # type: ignore
 # ruff: noqa
 # flake8: noqa
+# @omlish-generated
 # Generated from Json5.g4 by ANTLR 4.13.2
 from ....text.antlr._runtime._all import *
 if "." in __name__:

omlish/formats/json5/parsing.py

@@ -11,6 +11,9 @@ from .literals import parse_number_literal
 from .literals import parse_string_literal
 
 
+##
+
+
 class Json5ParseVisitor(antlr.parsing.StandardParseTreeVisitor, Json5Visitor):
     def visitArr(self, ctx: Json5Parser.ArrContext):
         return [self.visit(e) for e in ctx.value()]
@@ -57,16 +60,18 @@ class Json5ParseVisitor(antlr.parsing.StandardParseTreeVisitor, Json5Visitor):
             return super().visitChildren(ctx)
 
 
+def _make_parser(buf: str) -> Json5Parser:
+    return antlr.parsing.make_parser(
+        buf,
+        Json5Lexer,
+        Json5Parser,
+        silent_errors=True,
+    )
+
+
 def parse(buf: str) -> ta.Any:
     try:
-        parser = antlr.parsing.make_parser(
-            buf,
-            Json5Lexer,
-            Json5Parser,
-            silent_errors=True,
-        )
-
-        root = parser.json5()
+        root = _make_parser(buf).json5()
 
     except antlr.errors.ParseError as e:
         raise Json5Error from e
@@ -76,3 +81,20 @@ def parse(buf: str) -> ta.Any:
 
     visitor = Json5ParseVisitor()
     return visitor.visit(root)
+
+
+def parse_many(buf: str) -> ta.Generator[ta.Any]:
+    try:
+        parser = _make_parser(buf)
+
+        while True:
+            if parser.getInputStream().LT(1).type == antlr.runtime.Token.EOF:
+                break
+
+            value = parser.value()
+
+            visitor = Json5ParseVisitor()
+            yield visitor.visit(value)
+
+    except antlr.errors.ParseError as e:
+        raise Json5Error from e

omlish/formats/json5/rendering.py

@@ -1,5 +1,9 @@
+import io
+import re
 import typing as ta
 
+from ... import check
+from ... import lang
 from ..json import Scalar
 from ..json.literals import ESCAPE_MAP
 from ..json.literals import encode_string
@@ -10,11 +14,18 @@ from ..json.rendering import JsonRendererOut
 ##
 
 
+MULTILINE_STRINGS_ENDL = '\\\n'
+MULTILINE_STRINGS_LQ = '"' + MULTILINE_STRINGS_ENDL
+MULTILINE_STRINGS_RQ = MULTILINE_STRINGS_ENDL + '"'
+MULTILINE_STRINGS_NL = '\\n' + MULTILINE_STRINGS_ENDL
+
 MULTILINE_STRINGS_ESCAPE_MAP = {
     **ESCAPE_MAP,
-    '\n': '\\n\\\n',
+    '\n': MULTILINE_STRINGS_NL,
 }
 
+SOFTWRAP_WS_PAT = re.compile(r'\s+')
+
 
 class Json5Renderer(JsonRenderer):
     def __init__(
@@ -22,24 +33,124 @@ class Json5Renderer(JsonRenderer):
             out: JsonRendererOut,
             *,
             multiline_strings: bool = False,
+            softwrap_length: int | None = None,
             **kwargs: ta.Any,
     ) -> None:
         super().__init__(out, **kwargs)
 
         self._multiline_strings = multiline_strings
+        self._softwrap_length = softwrap_length
+
+    def _softwrap_string_chunks(self, chunks: list[str]) -> str:
+        multiline_strings = self._multiline_strings
+        softwrap_len = check.not_none(self._softwrap_length)
+
+        out = io.StringIO()
+        out.write(MULTILINE_STRINGS_LQ)
+
+        l = 0
+
+        def write(s: str) -> None:
+            nonlocal l
+            if l >= (softwrap_len - (sl := len(s))):
+                out.write(MULTILINE_STRINGS_ENDL)
+                l = 0
+
+            out.write(s)
+            l += sl
+
+        for c in chunks:
+            if not c:
+                continue
+
+            if c == '\\n' and multiline_strings:
+                if (softwrap_len - l) > 2:
+                    out.write('\\n\\\n')
+                else:
+                    out.write('\\\n\\n\\\n')
+                l = 0
+                continue
+
+            it: ta.Iterable[str | re.Match]
+            if c[0] == '\\':
+                it = [c]
+            else:
+                it = lang.iter_matches(SOFTWRAP_WS_PAT, c)
+
+            for x in it:
+                if isinstance(x, re.Match):
+                    ws = x.group(0)
+                    r = softwrap_len - l
+                    if len(ws) > r:
+                        write(ws[:r])
+                        p = r
+                        while p < len(ws):
+                            write(ws[p:(np := (p + softwrap_len))])
+                            p = np
+
+                    else:
+                        write(ws)
+
+                else:
+                    write(x)
+
+        out.write(MULTILINE_STRINGS_RQ)
+        return out.getvalue()
+
+    def _format_string(self, s: str, state: JsonRenderer.State | None = None) -> str:
+        num_nls = s.count('\n')
+        is_multiline = self._multiline_strings and num_nls
+
+        if (softwrap_len := self._softwrap_length) is not None:
+            def process_chunks(chunks: list[str]) -> list[str]:
+                naive_len = sum(map(len, chunks))
+
+                if is_multiline:
+                    if naive_len < (
+                        softwrap_len -
+                        len(MULTILINE_STRINGS_LQ) -
+                        (num_nls * (len(MULTILINE_STRINGS_NL) - 1)) -
+                        len(MULTILINE_STRINGS_RQ)
+                    ):
+                        return [
+                            MULTILINE_STRINGS_LQ,
+                            *[
+                                MULTILINE_STRINGS_NL if c == '\\n' else c
+                                for c in chunks
+                            ],
+                            MULTILINE_STRINGS_RQ,
+                        ]
+
+                elif naive_len < softwrap_len:
+                    return [
+                        '"',
+                        *chunks,
+                        '"',
+                    ]
+
+                return [self._softwrap_string_chunks(chunks)]
 
-    def _format_scalar(self, o: Scalar, state: JsonRenderer.State | None = None) -> str:
-        if (
-                self._multiline_strings and
-                isinstance(o, str) and
-                '\n' in o
-        ):
             return encode_string(
-                o,
-                lq='"\\\n',
+                s,
+                q='',
+                ensure_ascii=self._ensure_ascii,
+                process_chunks=process_chunks,
+            )
+
+        if is_multiline:
+            return encode_string(
+                s,
+                lq=MULTILINE_STRINGS_LQ,
+                rq=MULTILINE_STRINGS_RQ,
                 escape_map=MULTILINE_STRINGS_ESCAPE_MAP,
                 ensure_ascii=self._ensure_ascii,
             )
 
+        return super()._format_scalar(s, state=state)
+
+    def _format_scalar(self, o: Scalar, state: JsonRenderer.State | None = None) -> str:
+        if isinstance(o, str):
+            return self._format_string(o)
+
         else:
-            return super()._format_scalar(o)
+            return super()._format_scalar(o, state=state)

omlish/lang/__init__.py

@@ -327,6 +327,7 @@ from .strings import (  # noqa
     is_ident_cont,
     is_ident_start,
     is_sunder,
+    iter_matches,
     prefix_delimited,
     prefix_lines,
     replace_many,

omlish/lang/classes/namespaces.py

@@ -1,6 +1,7 @@
 import abc
 import typing as ta
 
+from .abstract import Abstract
 from .restrict import NotInstantiable
 
 
@@ -50,9 +51,13 @@ class GenericNamespaceMeta(abc.ABCMeta, ta.Generic[V]):
             **kwargs,
     ):
         if bases:
-            for nc in (NotInstantiable,):
-                if nc not in bases:
-                    bases += (nc,)
+            if NotInstantiable not in bases and not any(NotInstantiable in b.__mro__ for b in bases):
+                if Abstract in bases:
+                    # Must go before Abstract for mro because NotInstantiable is itself Abstract
+                    ai = bases.index(Abstract)
+                    bases = (*bases[:ai], NotInstantiable, *bases[ai:])
+                else:
+                    bases += (NotInstantiable,)
 
         if check_values is _NOT_SET:
             check_values = mcls.__namespace_check_values__

omlish/lang/strings.py

@@ -1,3 +1,4 @@
+import re
 import typing as ta
 import unicodedata
 
@@ -210,3 +211,17 @@ STRING_BOOL_VALUES: ta.Mapping[str, bool] = {
     ]
     for k in ks
 }
+
+
+##
+
+
+def iter_matches(pat: re.Pattern[str], s: str, **kwargs: ta.Any) -> ta.Generator[str | re.Match]:
+    p = 0
+    for m in re.finditer(pat, s, **kwargs):
+        if p < (l := m.start()):
+            yield s[p:l]
+        yield m
+        p = m.end()
+    if p < len(s):
+        yield s[p:]

omlish/specs/jmespath/__init__.py

@@ -20,6 +20,7 @@ From community:
  - JEP-18 Grouping - https://github.com/jmespath-community/jmespath.spec/discussions/96#discussion-4282156
  - JEP-19 Evaluation of Pipe Expressions - https://github.com/jmespath-community/jmespath.spec/discussions/113#discussioncomment-4000862
  - JEP-20 Compact syntax for multi-select-hash - https://github.com/jmespath-community/jmespath.spec/discussions/19
+ - JEP-21 Ternary Conditional Expression - https://github.com/jmespath-community/jmespath.spec/pull/182
 
 See:
  - https://github.com/jmespath-community/jmespath.spec/tree/main

omlish/specs/jmespath/ast.py

@@ -5,6 +5,9 @@ import typing as ta
 from ... import lang
 
 
+##
+
+
 @dc.dataclass(frozen=True)
 class Node(lang.Abstract):
     @property
@@ -20,6 +23,9 @@ class LeafNode(Node, lang.Abstract):
         return []
 
 
+##
+
+
 UnaryArithmeticOperator: ta.TypeAlias = ta.Literal[
     'plus',
     'minus',
@@ -269,6 +275,17 @@ class Slice(LeafNode, lang.Final):
     step: int | None
 
 
+@dc.dataclass(frozen=True)
+class TernaryOperator(Node, lang.Final):
+    condition: Node
+    if_truthy: Node
+    if_falsy: Node
+
+    @property
+    def children(self) -> ta.Sequence[Node]:
+        return [self.condition, self.if_truthy, self.if_falsy]
+
+
 @dc.dataclass(frozen=True)
 class ValueProjection(Node, lang.Final):
     left: Node

omlish/specs/jmespath/cli.py

@@ -15,6 +15,9 @@ from .parser import search
 from .visitor import node_type
 
 
+##
+
+
 def _ast_to_json(o: ta.Any) -> ta.Any:
     if isinstance(o, json.SCALAR_TYPES):
         return o

omlish/specs/jmespath/errors.py

@@ -1,6 +1,9 @@
 import typing as ta
 
 
+##
+
+
 class JmespathError(ValueError):
     pass
 

omlish/specs/jmespath/lexer.py

@@ -9,6 +9,9 @@ from .errors import LexerError
 from .visitor import Options
 
 
+##
+
+
 class Token(ta.TypedDict):
     type: str
     value: ta.Any
@@ -37,6 +40,7 @@ class Lexer:
         '}': 'rbrace',
         '+': 'plus',
         '%': 'modulo',
+        '?': 'question',
         '\u2212': 'minus',
         '\u00d7': 'multiply',
         '\u00f7': 'divide',

omlish/specs/jmespath/parser.py

@@ -54,6 +54,7 @@ from .ast import Projection
 from .ast import RootNode
 from .ast import Slice
 from .ast import Subexpression
+from .ast import TernaryOperator
 from .ast import UnaryArithmeticOperator
 from .ast import ValueProjection
 from .ast import VariableRef
@@ -67,6 +68,9 @@ from .visitor import Options
 from .visitor import TreeInterpreter
 
 
+##
+
+
 class Parser:
     BINDING_POWER: ta.Mapping[str, int] = {
         'eof': 0,
@@ -85,8 +89,9 @@ class Parser:
         'expref': 0,
         'colon': 0,
         'pipe': 1,
-        'or': 2,
-        'and': 3,
+        'question': 2,
+        'or': 3,
+        'and': 4,
         'eq': 5,
         'gt': 5,
         'lt': 5,
@@ -482,6 +487,12 @@ class Parser:
             right = self._parse_projection_rhs(self.BINDING_POWER['star'])
             return Projection(left, right)
 
+    def _token_led_question(self, condition: Node) -> Node:
+        left = self._expression()
+        self._match('colon')
+        right = self._expression()
+        return TernaryOperator(condition, left, right)
+
     def _project_if_slice(self, left: Node, right: Node) -> Node:
         index_expr = IndexExpression([left, right])
         if isinstance(right, Slice):

omlish/specs/jmespath/scope.py

@@ -5,6 +5,9 @@ K = ta.TypeVar('K')
 V = ta.TypeVar('V')
 
 
+##
+
+
 class ScopedChainDict(ta.Generic[K, V]):
     """
     Dictionary that can delegate lookups to multiple dicts. This provides a basic get/set dict interface that is backed

omlish/specs/jmespath/visitor.py

@@ -37,6 +37,7 @@ from .ast import Projection
 from .ast import RootNode
 from .ast import Slice
 from .ast import Subexpression
+from .ast import TernaryOperator
 from .ast import UnaryArithmeticOperator
 from .ast import ValueProjection
 from .ast import VariableRef
@@ -445,6 +446,14 @@ class TreeInterpreter(Visitor):
         except KeyError:
             raise UndefinedVariableError(node.name)  # noqa
 
+    def visit_ternary_operator(self, node: TernaryOperator, value: ta.Any) -> ta.Any:
+        evaluation = self.visit(node.condition, value)
+
+        if self._is_false(evaluation):
+            return self.visit(node.if_falsy, value)
+        else:
+            return self.visit(node.if_truthy, value)
+
     def visit_value_projection(self, node: ValueProjection, value: ta.Any) -> ta.Any:
         base = self.visit(node.left, value)
         try:

omlish/specs/proto/_antlr/Protobuf3Lexer.py

@@ -1,6 +1,7 @@
 # type: ignore
 # ruff: noqa
 # flake8: noqa
+# @omlish-generated
 # Generated from Protobuf3.g4 by ANTLR 4.13.2
 from ....text.antlr._runtime._all import *
 from io import StringIO

omlish/specs/proto/_antlr/Protobuf3Listener.py

@@ -1,6 +1,7 @@
 # type: ignore
 # ruff: noqa
 # flake8: noqa
+# @omlish-generated
 # Generated from Protobuf3.g4 by ANTLR 4.13.2
 from ....text.antlr._runtime._all import *
 if "." in __name__:

omlish/specs/proto/_antlr/Protobuf3Parser.py

@@ -1,6 +1,7 @@
 # type: ignore
 # ruff: noqa
 # flake8: noqa
+# @omlish-generated
 # Generated from Protobuf3.g4 by ANTLR 4.13.2
 # encoding: utf-8
 from ....text.antlr._runtime._all import *

omlish/specs/proto/_antlr/Protobuf3Visitor.py

@@ -1,6 +1,7 @@
 # type: ignore
 # ruff: noqa
 # flake8: noqa
+# @omlish-generated
 # Generated from Protobuf3.g4 by ANTLR 4.13.2
 from ....text.antlr._runtime._all import *
 if "." in __name__:

omlish/sql/parsing/_antlr/MinisqlLexer.py

@@ -1,6 +1,7 @@
 # type: ignore
 # ruff: noqa
 # flake8: noqa
+# @omlish-generated
 # Generated from Minisql.g4 by ANTLR 4.13.2
 from ....text.antlr._runtime._all import *
 from io import StringIO

omlish/sql/parsing/_antlr/MinisqlListener.py

@@ -1,6 +1,7 @@
 # type: ignore
 # ruff: noqa
 # flake8: noqa
+# @omlish-generated
 # Generated from Minisql.g4 by ANTLR 4.13.2
 from ....text.antlr._runtime._all import *
 if "." in __name__:

omlish/sql/parsing/_antlr/MinisqlParser.py

@@ -1,6 +1,7 @@
 # type: ignore
 # ruff: noqa
 # flake8: noqa
+# @omlish-generated
 # Generated from Minisql.g4 by ANTLR 4.13.2
 # encoding: utf-8
 from ....text.antlr._runtime._all import *

omlish/sql/parsing/_antlr/MinisqlVisitor.py

@@ -1,6 +1,7 @@
 # type: ignore
 # ruff: noqa
 # flake8: noqa
+# @omlish-generated
 # Generated from Minisql.g4 by ANTLR 4.13.2
 from ....text.antlr._runtime._all import *
 if "." in __name__:

{omlish-0.0.0.dev360.dist-info → omlish-0.0.0.dev362.dist-info}/METADATA

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