omlish 0.0.0.dev85__tar.gz → 0.0.0.dev86__tar.gz

{omlish-0.0.0.dev85/omlish.egg-info → omlish-0.0.0.dev86}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev85
+Version: 0.0.0.dev86
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev85 → omlish-0.0.0.dev86}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev85'
-__revision__ = '24c65e4f91478fb31341b3508843574da87b8786-untracked'
+__version__ = '0.0.0.dev86'
+__revision__ = '39be25efaa0206ceb3478be1878e14671f5940f1'
 
 
 #

{omlish-0.0.0.dev85 → omlish-0.0.0.dev86}/omlish/formats/json/stream/lex.py

@@ -52,14 +52,18 @@ SCALAR_VALUE_TYPES: tuple[type, ...] = tuple(
 ##
 
 
+class Position(ta.NamedTuple):
+    ofs: int
+    line: int
+    col: int
+
+
 class Token(ta.NamedTuple):
     kind: TokenKind
     value: ScalarValue
     raw: str | None
 
-    ofs: int
-    line: int
-    col: int
+    pos: Position
 
     def __iter__(self):
         raise TypeError
@@ -94,9 +98,7 @@ CONST_TOKENS: ta.Mapping[str, tuple[TokenKind, str | float | None]] = {
 class JsonLexError(Exception):
     message: str
 
-    ofs: int
-    line: int
-    col: int
+    pos: Position
 
 
 class JsonStreamLexer(GenMachine[str, Token]):
@@ -108,13 +110,21 @@ class JsonStreamLexer(GenMachine[str, Token]):
         self._include_raw = include_raw
 
         self._ofs = 0
-        self._line = 0
+        self._line = 1
         self._col = 0
 
         self._buf = io.StringIO()
 
         super().__init__(self._do_main())
 
+    @property
+    def pos(self) -> Position:
+        return Position(
+            self._ofs,
+            self._line,
+            self._col,
+        )
+
     def _char_in(self, c: str) -> str:
         if c and len(c) != 1:
             raise ValueError(c)
@@ -134,14 +144,13 @@ class JsonStreamLexer(GenMachine[str, Token]):
             kind: TokenKind,
             value: ScalarValue,
             raw: str,
+            pos: Position,
     ) -> ta.Sequence[Token]:
         tok = Token(
             kind,
             value,
             raw if self._include_raw else None,
-            self._ofs,
-            self._line,
-            self._col,
+            pos,
         )
         return (tok,)
 
@@ -152,7 +161,7 @@ class JsonStreamLexer(GenMachine[str, Token]):
         return raw
 
     def _raise(self, msg: str) -> ta.NoReturn:
-        raise JsonLexError(msg, self._ofs, self._line, self._col)
+        raise JsonLexError(msg, self.pos)
 
     def _do_main(self):
         while True:
@@ -165,7 +174,7 @@ class JsonStreamLexer(GenMachine[str, Token]):
                 continue
 
             if c in CONTROL_TOKENS:
-                yield self._make_tok(CONTROL_TOKENS[c], c, c)
+                yield self._make_tok(CONTROL_TOKENS[c], c, c, self.pos)
                 continue
 
             if c == '"':
@@ -180,8 +189,11 @@ class JsonStreamLexer(GenMachine[str, Token]):
             self._raise(f'Unexpected character: {c}')
 
     def _do_string(self):
+        check.state(self._buf.tell() == 0)
         self._buf.write('"')
 
+        pos = self.pos
+
         last = None
         while True:
             try:
@@ -199,13 +211,16 @@ class JsonStreamLexer(GenMachine[str, Token]):
 
         raw = self._flip_buf()
         sv = json.loads(raw)
-        yield self._make_tok('STRING', sv, raw)
+        yield self._make_tok('STRING', sv, raw, pos)
 
         return self._do_main()
 
     def _do_number(self, c: str):
+        check.state(self._buf.tell() == 0)
         self._buf.write(c)
 
+        pos = self.pos
+
         while True:
             try:
                 c = self._char_in((yield None))  # noqa
@@ -240,7 +255,7 @@ class JsonStreamLexer(GenMachine[str, Token]):
                 self._raise(f'Invalid number format: {raw}')
 
             tk, tv = CONST_TOKENS[raw]
-            yield self._make_tok(tk, tv, raw)
+            yield self._make_tok(tk, tv, raw, pos)
 
             return self._do_main()
 
@@ -250,7 +265,7 @@ class JsonStreamLexer(GenMachine[str, Token]):
             nv = float(raw)
         else:
             nv = int(raw)
-        yield self._make_tok('NUMBER', nv, raw)
+        yield self._make_tok('NUMBER', nv, raw, pos)
 
         #
 
@@ -258,7 +273,7 @@ class JsonStreamLexer(GenMachine[str, Token]):
             return None
 
         if c in CONTROL_TOKENS:
-            yield self._make_tok(CONTROL_TOKENS[c], c, c)
+            yield self._make_tok(CONTROL_TOKENS[c], c, c, pos)
 
         elif not c.isspace():
             self._raise(f'Unexpected character after number: {c}')
@@ -266,6 +281,7 @@ class JsonStreamLexer(GenMachine[str, Token]):
         return self._do_main()
 
     def _do_const(self, c: str):
+        pos = self.pos
         raw = c
         while True:
             try:
@@ -280,6 +296,6 @@ class JsonStreamLexer(GenMachine[str, Token]):
                 self._raise(f'Invalid literal: {raw}')
 
         tk, tv = CONST_TOKENS[raw]
-        yield self._make_tok(tk, tv, raw)
+        yield self._make_tok(tk, tv, raw, pos)
 
         return self._do_main()

{omlish-0.0.0.dev85 → omlish-0.0.0.dev86}/omlish/http/sse.py

@@ -1,6 +1,9 @@
 """
 TODO:
  - end-of-line   = ( cr lf / cr / lf )
+
+See:
+ - https://github.com/florimondmanca/httpx-sse/blob/master/src/httpx_sse/_decoders.py
 """
 import string
 import typing as ta

{omlish-0.0.0.dev85 → omlish-0.0.0.dev86/omlish.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omlish
-Version: 0.0.0.dev85
+Version: 0.0.0.dev86
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev85 → omlish-0.0.0.dev86}/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.dev85'
+version = '0.0.0.dev86'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',