omlish 0.0.0.dev85__py3-none-any.whl → 0.0.0.dev86__py3-none-any.whl

omlish/__about__.py

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

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/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.dist-info → omlish-0.0.0.dev86.dist-info}/METADATA

@@ -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.dist-info → omlish-0.0.0.dev86.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=hTFp9tvE72BxKloIq1s1SS0LRQlIsvMtO69Sbc47rKg,1704
-omlish/__about__.py,sha256=k58Z80qSth9c-pBdbNtNHrjB2AYw-SW6T3eOVAZW-eU,3355
+omlish/__about__.py,sha256=bmf1Xnu5T4--9ykGD63NIvhEZE9Fhk9w3IlmwLH40vU,3345
 omlish/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/argparse.py,sha256=Dc73G8lyoQBLvXhMYUbzQUh4SJu_OTvKUXjSUxq_ang,7499
 omlish/c3.py,sha256=4vogWgwPb8TbNS2KkZxpoWbwjj7MuHG2lQG-hdtkvjI,8062
@@ -201,7 +201,7 @@ omlish/formats/json/cli/cli.py,sha256=GkdNokklRuDWiXAIai1wijSBFVJlpdlNLTQ3Lyucos
 omlish/formats/json/cli/formats.py,sha256=tqEZKby4HeafGcaUs-m8B-2ZV12dRo40rzL-V99cp00,1714
 omlish/formats/json/stream/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/formats/json/stream/build.py,sha256=6deXBxTx1toFAPShz2Jo5OiXxH5Y4ppG8gDPRFoUgjA,2461
-omlish/formats/json/stream/lex.py,sha256=hMnsZld72XE7GCWdjbUANRxrruuBSSQeCm8wypMiMv0,6172
+omlish/formats/json/stream/lex.py,sha256=01K_M9na7-3xv0h3VDBobLXuTS-w4YesNJ6GhOaDtYA,6494
 omlish/formats/json/stream/parse.py,sha256=WkbW7tvcdrTSluKhw70nPvjsq943eryVcjx8FSz78tM,5198
 omlish/formats/json/stream/render.py,sha256=B9ZNuBiDJOT25prhIsZu1ICKjxk4eMPwpgQF37NPufs,3212
 omlish/graphs/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -224,7 +224,7 @@ omlish/http/headers.py,sha256=ZMmjrEiYjzo0YTGyK0YsvjdwUazktGqzVVYorY4fd44,5081
 omlish/http/json.py,sha256=9XwAsl4966Mxrv-1ytyCqhcE6lbBJw-0_tFZzGszgHE,7440
 omlish/http/multipart.py,sha256=R9ycpHsXRcmh0uoc43aYb7BdWL-8kSQHe7J-M81aQZM,2240
 omlish/http/sessions.py,sha256=VZ_WS5uiQG5y7i3u8oKuQMqf8dPKUOjFm_qk_0OvI8c,4793
-omlish/http/sse.py,sha256=T2_EXTcDfEhCF4E9B68YtEYLFb803MPnh8eCNjdPlRo,2223
+omlish/http/sse.py,sha256=MDs9RvxQXoQliImcc6qK1ERajEYM7Q1l8xmr-9ceNBc,2315
 omlish/http/wsgi.py,sha256=czZsVUX-l2YTlMrUjKN49wRoP4rVpS0qpeBn4O5BoMY,948
 omlish/inject/__init__.py,sha256=JQ7x8l9MjU-kJ5ap7cPVq7SY7zbbCIrjyJAF0UeE5-s,1886
 omlish/inject/binder.py,sha256=H8AQ4ecmBOtDL8fMgrU1yUJl1gBADLNcdysRbvO8Wso,4167
@@ -454,9 +454,9 @@ omlish/text/delimit.py,sha256=ubPXcXQmtbOVrUsNh5gH1mDq5H-n1y2R4cPL5_DQf68,4928
 omlish/text/glyphsplit.py,sha256=Ug-dPRO7x-OrNNr8g1y6DotSZ2KH0S-VcOmUobwa4B0,3296
 omlish/text/indent.py,sha256=6Jj6TFY9unaPa4xPzrnZemJ-fHsV53IamP93XGjSUHs,1274
 omlish/text/parts.py,sha256=7vPF1aTZdvLVYJ4EwBZVzRSy8XB3YqPd7JwEnNGGAOo,6495
-omlish-0.0.0.dev85.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev85.dist-info/METADATA,sha256=qZazqEAxsweclSEJaWK9VAPkIIz48Xl30VrfFamUMi0,3987
-omlish-0.0.0.dev85.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-omlish-0.0.0.dev85.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev85.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev85.dist-info/RECORD,,
+omlish-0.0.0.dev86.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev86.dist-info/METADATA,sha256=w6dXN4XU0iMfkJxV1fEHQ96o_V5idhf7cy3GApDwdAc,3987
+omlish-0.0.0.dev86.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+omlish-0.0.0.dev86.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev86.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev86.dist-info/RECORD,,