omlish 0.0.0.dev303__py3-none-any.whl → 0.0.0.dev304__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev303'
-__revision__ = '8c675f0f9a5c459eddf54867184cd1da05cff6ac'
+__version__ = '0.0.0.dev304'
+__revision__ = '0ecc67df99993947b491b2d6d6163fd00b00202e'
 
 
 #

omlish/lang/casing.py

@@ -78,7 +78,7 @@ class LowCamelCase(StringCasing):
     """fooBarBaz"""
 
     _MATCH_PAT: ta.ClassVar[re.Pattern] = re.compile(r'[a-z][a-z0-9]*(?:[A-Z][a-z0-9]*)*')
-    _SPLIT_PAT: ta.ClassVar[re.Pattern] = re.compile(r'^[a-z0-9]+')
+    _FIRST_PAT: ta.ClassVar[re.Pattern] = re.compile(r'^[a-z0-9]+')
     _UPPER_PAT: ta.ClassVar[re.Pattern] = re.compile(r'[A-Z][a-z0-9]*')
 
     def match(self, s: str) -> bool:
@@ -88,7 +88,7 @@ class LowCamelCase(StringCasing):
         if not self.match(s):
             raise ImproperStringCasingError(f'Not valid lowCamelCase: {s!r}')
         parts: list[str] = []
-        m0 = self._SPLIT_PAT.match(s)
+        m0 = self._FIRST_PAT.match(s)
         if m0:
             parts.append(m0.group(0))
             start = m0.end()

omlish/specs/jsonschema/__init__.py

@@ -44,6 +44,10 @@ from .keywords.unknown import (  # noqa
 )
 
 from .keywords.validation import (  # noqa
+    AdditionalProperties,
+    AnyOf,
+    Const,
+    Enum,
     ExclusiveMaximum,
     ExclusiveMinimum,
     Items,
@@ -51,6 +55,7 @@ from .keywords.validation import (  # noqa
     Maximum,
     MinItems,
     Minimum,
+    OneOf,
     Properties,
     Required,
     Type,

omlish/specs/jsonschema/keywords/base.py

@@ -75,6 +75,16 @@ class Keywords(lang.Final):
 ##
 
 
+@dc.dataclass(frozen=True)
+class AnyKeyword(Keyword, lang.Abstract):
+    v: ta.Any
+
+
+@dc.dataclass(frozen=True)
+class AnyArrayKeyword(Keyword, lang.Abstract):
+    vs: ta.Sequence[ta.Any]
+
+
 @dc.dataclass(frozen=True)
 class BooleanKeyword(Keyword, lang.Abstract):
     b: bool
@@ -91,7 +101,7 @@ class StrKeyword(Keyword, lang.Abstract):
 
 
 @dc.dataclass(frozen=True)
-class StrOrStrsKeyword(Keyword, lang.Abstract):
+class StrOrStrArrayKeyword(Keyword, lang.Abstract):
     ss: str | ta.Sequence[str]
 
 
@@ -100,6 +110,16 @@ class KeywordsKeyword(Keyword, lang.Abstract):
     kw: Keywords
 
 
+@dc.dataclass(frozen=True)
+class KeywordsArrayKeyword(Keyword, lang.Abstract):
+    kws: ta.Sequence[Keywords]
+
+
 @dc.dataclass(frozen=True)
 class StrToKeywordsKeyword(Keyword, lang.Abstract):
     m: ta.Mapping[str, Keywords]
+
+
+@dc.dataclass(frozen=True)
+class BooleanOrKeywordsKeyword(Keyword, lang.Abstract):
+    bk: bool | Keywords

omlish/specs/jsonschema/keywords/parse.py

@@ -3,14 +3,18 @@ import typing as ta
 from .... import check
 from .... import collections as col
 from .... import lang
+from .base import AnyArrayKeyword
+from .base import AnyKeyword
 from .base import BooleanKeyword
+from .base import BooleanOrKeywordsKeyword
 from .base import Keyword
 from .base import Keywords
+from .base import KeywordsArrayKeyword
 from .base import KeywordsKeyword
 from .base import KnownKeyword
 from .base import NumberKeyword
 from .base import StrKeyword
-from .base import StrOrStrsKeyword
+from .base import StrOrStrArrayKeyword
 from .base import StrToKeywordsKeyword
 from .core import CoreKeyword
 from .format import FormatKeyword
@@ -69,16 +73,28 @@ class KeywordParser:
         self._allow_unknown = allow_unknown
 
     def parse_keyword(self, cls: type[KeywordT], v: ta.Any) -> KeywordT:
-        if issubclass(cls, BooleanKeyword):
+        if issubclass(cls, AnyKeyword):
+            return cls(v)  # type: ignore
+
+        elif issubclass(cls, AnyArrayKeyword):
+            return cls(tuple(check.isinstance(v, ta.Sequence)))  # type: ignore
+
+        elif issubclass(cls, BooleanKeyword):
             return cls(check.isinstance(v, bool))  # type: ignore
 
+        elif issubclass(cls, BooleanOrKeywordsKeyword):
+            if isinstance(v, bool):
+                return cls(v)  # type: ignore
+            else:
+                return cls(self.parse_keywords(v))  # type: ignore
+
         elif issubclass(cls, NumberKeyword):
             return cls(check.isinstance(v, (int, float)))  # type: ignore
 
         elif issubclass(cls, StrKeyword):
             return cls(check.isinstance(v, str))  # type: ignore
 
-        elif issubclass(cls, StrOrStrsKeyword):
+        elif issubclass(cls, StrOrStrArrayKeyword):
             ss: str | ta.Sequence[str]
             if isinstance(v, str):
                 ss = v
@@ -91,6 +107,9 @@ class KeywordParser:
         elif issubclass(cls, KeywordsKeyword):
             return cls(self.parse_keywords(v))  # type: ignore
 
+        elif issubclass(cls, KeywordsArrayKeyword):
+            return cls(tuple(self.parse_keywords(e) for e in v))  # type: ignore
+
         elif issubclass(cls, StrToKeywordsKeyword):
             return cls({k: self.parse_keywords(mv) for k, mv in v.items()})  # type: ignore
 

omlish/specs/jsonschema/keywords/render.py

@@ -1,12 +1,16 @@
 import typing as ta
 
+from .base import AnyArrayKeyword
+from .base import AnyKeyword
 from .base import BooleanKeyword
+from .base import BooleanOrKeywordsKeyword
 from .base import Keyword
 from .base import Keywords
+from .base import KeywordsArrayKeyword
 from .base import KeywordsKeyword
 from .base import NumberKeyword
 from .base import StrKeyword
-from .base import StrOrStrsKeyword
+from .base import StrOrStrArrayKeyword
 from .base import StrToKeywordsKeyword
 from .unknown import UnknownKeyword
 
@@ -15,16 +19,28 @@ from .unknown import UnknownKeyword
 
 
 def render_keyword(kw: Keyword) -> dict[str, ta.Any]:
-    if isinstance(kw, BooleanKeyword):
+    if isinstance(kw, AnyKeyword):
+        return {kw.tag: kw.v}
+
+    elif isinstance(kw, AnyArrayKeyword):
+        return {kw.tag: kw.vs}
+
+    elif isinstance(kw, BooleanKeyword):
         return {kw.tag: kw.b}
 
+    elif isinstance(kw, BooleanOrKeywordsKeyword):
+        if isinstance(kw.bk, bool):
+            return {kw.tag: kw.bk}
+        else:
+            return {kw.tag: render_keywords(kw.bk)}
+
     elif isinstance(kw, NumberKeyword):
         return {kw.tag: kw.n}
 
     elif isinstance(kw, StrKeyword):
         return {kw.tag: kw.s}
 
-    elif isinstance(kw, StrOrStrsKeyword):
+    elif isinstance(kw, StrOrStrArrayKeyword):
         if isinstance(kw.ss, str):
             return {kw.tag: kw.ss}
         else:
@@ -33,6 +49,9 @@ def render_keyword(kw: Keyword) -> dict[str, ta.Any]:
     elif isinstance(kw, KeywordsKeyword):
         return {kw.tag: render_keywords(kw.kw)}
 
+    elif isinstance(kw, KeywordsArrayKeyword):
+        return {kw.tag: [render_keywords(c) for c in kw.kws]}
+
     elif isinstance(kw, StrToKeywordsKeyword):
         return {kw.tag: {k: render_keywords(v) for k, v in kw.m.items()}}
 

omlish/specs/jsonschema/keywords/validation.py

@@ -1,9 +1,13 @@
 from .... import lang
+from .base import AnyArrayKeyword
+from .base import AnyKeyword
 from .base import BooleanKeyword
+from .base import BooleanOrKeywordsKeyword
+from .base import KeywordsArrayKeyword
 from .base import KeywordsKeyword
 from .base import KnownKeyword
 from .base import NumberKeyword
-from .base import StrOrStrsKeyword
+from .base import StrOrStrArrayKeyword
 from .base import StrToKeywordsKeyword
 
 
@@ -17,7 +21,15 @@ class ValidationKeyword(KnownKeyword, lang.Abstract, lang.Sealed):
 ##
 
 
-class Type(StrOrStrsKeyword, ValidationKeyword, lang.Final, tag='type'):
+class Type(StrOrStrArrayKeyword, ValidationKeyword, lang.Final, tag='type'):
+    pass
+
+
+class Const(AnyKeyword, ValidationKeyword, lang.Final, tag='const'):
+    pass
+
+
+class Enum(AnyArrayKeyword, ValidationKeyword, lang.Final, tag='enum'):
     pass
 
 
@@ -25,7 +37,7 @@ class Items(KeywordsKeyword, ValidationKeyword, lang.Final, tag='items'):
     pass
 
 
-class Required(StrOrStrsKeyword, ValidationKeyword, lang.Final, tag='required'):
+class Required(StrOrStrArrayKeyword, ValidationKeyword, lang.Final, tag='required'):
     pass
 
 
@@ -33,6 +45,10 @@ class Properties(StrToKeywordsKeyword, ValidationKeyword, lang.Final, tag='prope
     pass
 
 
+class AdditionalProperties(BooleanOrKeywordsKeyword, ValidationKeyword, lang.Final, tag='additionalProperties'):
+    pass
+
+
 ##
 
 
@@ -65,3 +81,14 @@ class Minimum(NumberKeyword, ValidationKeyword, lang.Final, tag='minimum'):
 
 class ExclusiveMinimum(NumberKeyword, ValidationKeyword, lang.Final, tag='exclusiveMinimum'):
     pass
+
+
+#
+
+
+class AnyOf(KeywordsArrayKeyword, ValidationKeyword, lang.Final, tag='anyOf'):
+    pass
+
+
+class OneOf(KeywordsArrayKeyword, ValidationKeyword, lang.Final, tag='oneOf'):
+    pass

omlish/specs/jsonschema/schemas/LICENSE

@@ -0,0 +1,21 @@
+Copyright (c) 2022 JSON Schema Specification Authors
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the
+following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following
+   disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following
+   disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products
+   derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

{omlish-0.0.0.dev303.dist-info → omlish-0.0.0.dev304.dist-info}/METADATA

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

{omlish-0.0.0.dev303.dist-info → omlish-0.0.0.dev304.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=pjGUyLHaoWpPqRP3jz2u1fC1qoRc2lvrEcpU_Ax2tdg,8253
-omlish/__about__.py,sha256=ZtA9R7gsXvmQ5vqquGdnyiA7g3hwkTA_jGG19gRDrkI,3478
+omlish/__about__.py,sha256=F6X4fib8qJRwj4c8ttKlheoGULweTMxejclgu8k0w64,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
@@ -466,7 +466,7 @@ omlish/iterators/tools.py,sha256=c4hArZEVV8y9_dFfmRwakusv1cWJLT4MkTkGRjnGN5U,255
 omlish/iterators/unique.py,sha256=Nw0pSaNEcHAkve0ugfLPvJcirDOn9ECyC5wIL8JlJKI,1395
 omlish/lang/__init__.py,sha256=1m2Kc4CBk_C_B7ydPcGWTdCY00JRMrGtX_RlFvyVTo8,5729
 omlish/lang/attrs.py,sha256=i7euRF81uNF8QDmUVXSK_BtqLGshaMi4VVdUnMjiMwg,5050
-omlish/lang/casing.py,sha256=hMnWMBv-yP4tr8Rc9_An9IgcAsbtVcEb2D_7n8TaFgw,4636
+omlish/lang/casing.py,sha256=cFUlbDdXLhwnWwcYx4qnM5c4zGX7hIRUfcjiZbxUD28,4636
 omlish/lang/clsdct.py,sha256=HAGIvBSbCefzRjXriwYSBLO7QHKRv2UsE78jixOb-fA,1828
 omlish/lang/collections.py,sha256=LVm0Sory60IXyFzYhhO8BZAWy_z_pjiA-meXNlSJP7o,2465
 omlish/lang/comparison.py,sha256=MOwEG0Yny-jBPHO9kQto9FSRyeNpQW24UABsghkrHxY,1356
@@ -685,17 +685,18 @@ omlish/specs/jsonrpc/__init__.py,sha256=QQwr-jkgvwr1ZMlNwl5W1TuHcxx8RuzQVFwWwNhp
 omlish/specs/jsonrpc/errors.py,sha256=-Zgmlo6bV6J8w5f8h9axQgLquIFBHDgIwcpufEH5NsE,707
 omlish/specs/jsonrpc/marshal.py,sha256=HM736piPGnBZrg8CMLDX-L5fZpegyF6l6JUjzLoSDtk,1852
 omlish/specs/jsonrpc/types.py,sha256=emEiTPWsjsYy0jCC3It1bUEcu9nHp5y7-j73U1D6vl4,2700
-omlish/specs/jsonschema/__init__.py,sha256=qmlpJJlB9TBwvE2qCjRHeecNhEYonpbncXfX0T2L-do,1060
+omlish/specs/jsonschema/__init__.py,sha256=55P7Yg2MprqDyaifac2ExNzK6blTZuDP4ejrUXZWpt8,1129
 omlish/specs/jsonschema/types.py,sha256=_H7ma99hD3_Xu42BFGHOXRI5p79tY8WBX8QE36k7lbw,472
 omlish/specs/jsonschema/keywords/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-omlish/specs/jsonschema/keywords/base.py,sha256=jbLzU5_MeLcVrsbPlF2HPt0X0MldyOQmofZxelNTwP4,2416
+omlish/specs/jsonschema/keywords/base.py,sha256=KYxKDxZtJGykLcJPTPvDMPDbbmuUw6RLOGgpCNkFcww,2830
 omlish/specs/jsonschema/keywords/core.py,sha256=3Pbi8d-eocEAxEdemNa0ldp5lrLWNmH0Tye-5rglUoU,535
 omlish/specs/jsonschema/keywords/format.py,sha256=9trrxHe38FDx47I8UfvO4PD_IygRlkEyTUJ3XlxDM6Y,244
 omlish/specs/jsonschema/keywords/metadata.py,sha256=IVWQKWT9xi0R07pXc79ErT7RBu5b6Kzg4pWYIITIRbs,336
-omlish/specs/jsonschema/keywords/parse.py,sha256=zWSOhHHzXbj-Yn5owU_w0V5w8yhiW4qqc4c7lMvavk0,3690
-omlish/specs/jsonschema/keywords/render.py,sha256=kHlBwNjSvKtca0IXBP5DWDRW-H6MduO6PZjhkBFRImU,1353
+omlish/specs/jsonschema/keywords/parse.py,sha256=8lx17ZoaMF0u0NyAIVM9EmZD6gYLANlw0-zr9DN2HTA,4414
+omlish/specs/jsonschema/keywords/render.py,sha256=wZ9yvfscnW8fYlQTXzmJjMYTKhSTg9hjrtlAEwMRaMQ,1947
 omlish/specs/jsonschema/keywords/unknown.py,sha256=iYIQlBbLUqISvTvj_Kup4wVDRxcEwmnLTyAAWjlxsck,234
-omlish/specs/jsonschema/keywords/validation.py,sha256=RJdGAsl_FtUmw1Bin_mrJ5qhN06rBC3f_L-rCBYdIOc,1342
+omlish/specs/jsonschema/keywords/validation.py,sha256=bKu1bDOms5zxg5Xme1ki_jb7TYDFEOv_JKOzeYbxuYQ,1970
+omlish/specs/jsonschema/schemas/LICENSE,sha256=CU2AUO-rKNc9s9vngzyGxUMgaZ0Aevr8lgN2DFFFxKw,1491
 omlish/specs/jsonschema/schemas/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/specs/jsonschema/schemas/draft202012/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/specs/jsonschema/schemas/draft202012/metaschema.json,sha256=Qdp29a-3zgYtJI92JGOpL3ykfk4PkFsiS6av7vkd7Q8,2452
@@ -844,9 +845,9 @@ omlish/typedvalues/holder.py,sha256=ZTnHiw-K38ciOBLEdwgrltr7Xp8jjEs_0Lp69DH-G-o,
 omlish/typedvalues/marshal.py,sha256=hWHRLcrGav7lvXJDtb9bNI0ickl4SKPQ6F4BbTpqw3A,4219
 omlish/typedvalues/reflect.py,sha256=Ih1YgU-srUjsvBn_P7C66f73_VCvcwqE3ffeBnZBgt4,674
 omlish/typedvalues/values.py,sha256=ym46I-q2QJ_6l4UlERqv3yj87R-kp8nCKMRph0xQ3UA,1307
-omlish-0.0.0.dev303.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev303.dist-info/METADATA,sha256=Oe8ylkuWV_TTJtgQkuyG97boKvpRe_Z0O8At2xQ97SU,4416
-omlish-0.0.0.dev303.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
-omlish-0.0.0.dev303.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev303.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev303.dist-info/RECORD,,
+omlish-0.0.0.dev304.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev304.dist-info/METADATA,sha256=pBvxWE8MwSuga9H9NPi6L6YuxZ-EuSu4jYXGAn36N0Q,4416
+omlish-0.0.0.dev304.dist-info/WHEEL,sha256=wXxTzcEDnjrTwFYjLPcsW_7_XihufBwmpiBeiXNBGEA,91
+omlish-0.0.0.dev304.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev304.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev304.dist-info/RECORD,,

{omlish-0.0.0.dev303.dist-info → omlish-0.0.0.dev304.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.0.0)
+Generator: setuptools (80.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any