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

omlish/__about__.py

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

omlish/bootstrap/harness.py

@@ -35,7 +35,7 @@ from .base import SimpleBootstrap
 
 
 BOOTSTRAP_TYPES_BY_NAME: ta.Mapping[str, ta.Type[Bootstrap]] = {  # noqa
-    lang.snake_case(cls.__name__[:-len('Bootstrap')]): cls
+    lang.snake_case(*lang.split_string_casing(cls.__name__[:-len('Bootstrap')])): cls
     for cls in lang.deep_subclasses(Bootstrap, concrete_only=True)
 }
 

omlish/lang/__init__.py

@@ -23,6 +23,33 @@ from .cached.property import (  # noqa
     cached_property,
 )
 
+from .casing import (  # noqa
+    StringCasingError,
+    ImproperStringCasingError,
+    UnknownStringCasingError,
+    AmbiguousStringCasingError,
+
+    StringCasing,
+    CamelCase,
+    LowCamelCase,
+    SnakeCase,
+    UpSnakeCase,
+
+    STRING_CASINGS,
+    CAMEL_CASE,
+    LOW_CAMEL_CASE,
+    SNAKE_CASE,
+    UP_SNAKE_CASE,
+
+    camel_case,
+    low_camel_case,
+    snake_case,
+    up_snake_case,
+
+    get_string_casing,
+    split_string_casing,
+)
+
 from .classes.abstract import (  # noqa
     Abstract,
     AbstractTypeError,
@@ -260,7 +287,6 @@ from .strings import (  # noqa
     BOOL_STRINGS,
     BOOL_TRUE_STRINGS,
     STRING_BOOL_VALUES,
-    camel_case,
     find_any,
     indent_lines,
     is_dunder,
@@ -272,7 +298,6 @@ from .strings import (  # noqa
     prefix_lines,
     replace_many,
     rfind_any,
-    snake_case,
     strip_prefix,
     strip_suffix,
 )

omlish/lang/casing.py

@@ -0,0 +1,192 @@
+import abc
+import re
+import typing as ta
+
+
+##
+
+
+class StringCasingError(Exception):
+    pass
+
+
+class ImproperStringCasingError(StringCasingError):
+    pass
+
+
+class UnknownStringCasingError(StringCasingError):
+    pass
+
+
+class AmbiguousStringCasingError(StringCasingError):
+    pass
+
+
+def _check_all_lowercase(*ps: str) -> None:
+    for p in ps:
+        if p.lower() != p:
+            raise ImproperStringCasingError(p)
+
+
+##
+
+
+class StringCasing(abc.ABC):
+    @abc.abstractmethod
+    def match(self, s: str) -> bool:
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def split(self, s: str) -> list[str]:
+        """Returns lowercase."""
+
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def join(self, *parts: str) -> str:
+        """Expects lowercase."""
+
+        raise NotImplementedError
+
+
+#
+
+
+class CamelCase(StringCasing):
+    """FooBarBaz"""
+
+    _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-Z][a-z0-9]*')
+
+    def match(self, s: str) -> bool:
+        return bool(self._PAT.fullmatch(s))
+
+    def split(self, s: str) -> list[str]:
+        if not self.match(s):
+            raise ImproperStringCasingError(f'Not valid CamelCase: {s!r}')
+        return [m.group(0).lower() for m in self._SPLIT_PAT.finditer(s)]
+
+    def join(self, *parts: str) -> str:
+        _check_all_lowercase(*parts)
+        return ''.join(p.capitalize() for p in parts)
+
+
+#
+
+
+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]+')
+    _UPPER_PAT: ta.ClassVar[re.Pattern] = re.compile(r'[A-Z][a-z0-9]*')
+
+    def match(self, s: str) -> bool:
+        return bool(self._MATCH_PAT.fullmatch(s))
+
+    def split(self, s: str) -> list[str]:
+        if not self.match(s):
+            raise ImproperStringCasingError(f'Not valid lowCamelCase: {s!r}')
+        parts: list[str] = []
+        m0 = self._SPLIT_PAT.match(s)
+        if m0:
+            parts.append(m0.group(0))
+            start = m0.end()
+        else:
+            start = 0
+        for m in self._UPPER_PAT.finditer(s, pos=start):
+            parts.append(m.group(0))
+        return [p.lower() for p in parts]
+
+    def join(self, *parts: str) -> str:
+        _check_all_lowercase(*parts)
+        if not parts:
+            return ''
+        first, *rest = parts
+        return first.lower() + ''.join(p.capitalize() for p in rest)
+
+
+#
+
+
+class SnakeCase(StringCasing):
+    """foo_bar_baz"""
+
+    _PAT: ta.ClassVar[re.Pattern] = re.compile(r'[a-z0-9]+(?:_[a-z0-9]+)*')
+
+    def match(self, s: str) -> bool:
+        return bool(self._PAT.fullmatch(s))
+
+    def split(self, s: str) -> list[str]:
+        if not self.match(s):
+            raise ImproperStringCasingError(f'Not valid snake_case: {s!r}')
+        return s.split('_')
+
+    def join(self, *parts: str) -> str:
+        _check_all_lowercase(*parts)
+        return '_'.join(p.lower() for p in parts)
+
+
+#
+
+
+class UpSnakeCase(StringCasing):
+    """FOO_BAR_BAZ"""
+
+    _PAT: ta.ClassVar[re.Pattern] = re.compile(r'[A-Z0-9]+(?:_[A-Z0-9]+)*')
+
+    def match(self, s: str) -> bool:
+        return bool(self._PAT.fullmatch(s))
+
+    def split(self, s: str) -> list[str]:
+        if not self.match(s):
+            raise ImproperStringCasingError(f'Not valid UPPER_SNAKE_CASE: {s!r}')
+        return [part.lower() for part in s.split('_')]
+
+    def join(self, *parts: str) -> str:
+        _check_all_lowercase(*parts)
+        return '_'.join(p.upper() for p in parts)
+
+
+##
+
+
+STRING_CASINGS = [
+    (CAMEL_CASE := CamelCase()),
+    (LOW_CAMEL_CASE := LowCamelCase()),
+    (SNAKE_CASE := SnakeCase()),
+    (UP_SNAKE_CASE := UpSnakeCase()),
+]
+
+
+camel_case = CAMEL_CASE.join
+low_camel_case = LOW_CAMEL_CASE.join
+snake_case = SNAKE_CASE.join
+up_snake_case = UP_SNAKE_CASE.join
+
+
+##
+
+
+def get_string_casing(s: str, casings: ta.Iterable[StringCasing] | None = None) -> StringCasing:
+    if casings is None:
+        casings = STRING_CASINGS
+    cs = [c for c in casings if c.match(s)]
+    if not cs:
+        raise UnknownStringCasingError
+    if len(cs) != 1:
+        raise AmbiguousStringCasingError
+    [c] = cs
+    return c
+
+
+def split_string_casing(s: str, casings: ta.Iterable[StringCasing] | None = None) -> list[str]:
+    if casings is None:
+        casings = STRING_CASINGS
+    ts = {tuple(c.split(s)) for c in casings if c.match(s)}
+    if not ts:
+        raise UnknownStringCasingError
+    if len(ts) != 1:
+        raise AmbiguousStringCasingError
+    [t] = ts
+    return list(t)

omlish/lang/strings.py

@@ -84,23 +84,6 @@ def rfind_any(
 ##
 
 
-def camel_case(name: str, *, lower: bool = False) -> str:
-    if not name:
-        return ''
-    s = ''.join(map(str.capitalize, name.split('_')))  # noqa
-    if lower:
-        s = s[0].lower() + s[1:]
-    return s
-
-
-def snake_case(name: str) -> str:
-    uppers: list[int | None] = [i for i, c in enumerate(name) if c.isupper()]
-    return '_'.join([name[l:r].lower() for l, r in zip([None, *uppers], [*uppers, None])]).strip('_')
-
-
-##
-
-
 def is_dunder(name: str) -> bool:
     return (
         name[:2] == name[-2:] == '__' and

omlish/marshal/naming.py

@@ -5,6 +5,7 @@ TODO:
 """
 import enum
 
+from .. import check
 from .. import lang
 from .base import Option
 
@@ -16,11 +17,22 @@ class Naming(Option, enum.Enum):
 
 
 def translate_name(n: str, e: Naming) -> str:
+    check.non_empty_str(n)
+    check.not_equal(set(n), {'_'})
+
+    n1 = n.lstrip('_')
+    pfx = '_' * (len(n) - len(n1))
+    n2 = n1.rstrip('_')
+    sfx = '_' * (len(n1) - len(n2))
+    ps = lang.split_string_casing(n2)
+
     if e is Naming.SNAKE:
-        return lang.snake_case(n)
-    if e is Naming.CAMEL:
-        return lang.camel_case(n)
-    if e is Naming.LOW_CAMEL:
-        r = lang.camel_case(n)
-        return (r[0].lower() + r[1:]) if r else r
-    raise ValueError(e)
+        r = lang.snake_case(*ps)
+    elif e is Naming.CAMEL:
+        r = lang.camel_case(*ps)
+    elif e is Naming.LOW_CAMEL:
+        r = lang.low_camel_case(*ps)
+    else:
+        raise ValueError(e)
+
+    return pfx + r + sfx

omlish/specs/jmespath/visitor.py

@@ -104,7 +104,7 @@ def _is_actual_number(x: ta.Any) -> bool:
 
 
 def node_type(n: Node) -> str:
-    return lang.snake_case(type(n).__name__)
+    return lang.snake_case(*lang.split_string_casing(type(n).__name__))
 
 
 ##

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

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

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

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=pjGUyLHaoWpPqRP3jz2u1fC1qoRc2lvrEcpU_Ax2tdg,8253
-omlish/__about__.py,sha256=VEC7wFGaSoAMF2E62PWgQVju9B2RuX6O49UlGrjLBRo,3478
+omlish/__about__.py,sha256=ZtA9R7gsXvmQ5vqquGdnyiA7g3hwkTA_jGG19gRDrkI,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
@@ -132,7 +132,7 @@ omlish/bootstrap/__init__.py,sha256=-Rtsg7uPQNhh1dIT9nqrz96XlqizwoLnWf-FwOEstJI,
 omlish/bootstrap/__main__.py,sha256=4jCwsaogp0FrJjJZ85hzF4-WqluPeheHbfeoKynKvNs,194
 omlish/bootstrap/base.py,sha256=d8hqn4hp1XMMi5PgcJBQXPKmW47epu8CxBlqDZiRZb4,1073
 omlish/bootstrap/diag.py,sha256=iemH0nQEHEDzyZztvd_ygGGVpRpgn5UG6naxeQTvXp0,5347
-omlish/bootstrap/harness.py,sha256=VW8YP-yENGyXIuJ8GL_xintArF13nafwpz-iAghPt34,1967
+omlish/bootstrap/harness.py,sha256=BMFNTYG03V74WFW5zd6aaxIb6uzGeldiR3VX2alQwlU,1994
 omlish/bootstrap/main.py,sha256=yZhOHDDlj4xB5a89dRdT8z58FsqqnpoBg1-tvY2CJe4,5903
 omlish/bootstrap/marshal.py,sha256=mH6KVQILEG7Qb_mULNRe8DGDSZb99mQr9jve4mhqUfc,481
 omlish/bootstrap/sys.py,sha256=0F0uThMsYdjqUtzrYHr4Xsh_MjscxgWl149i_3tDOqo,8787
@@ -464,8 +464,9 @@ omlish/iterators/iterators.py,sha256=RxW35yQ5ed8vBQ22IqpDXFx-i5JiLQdp7-pkMZXhJJ8
 omlish/iterators/recipes.py,sha256=wOwOZg-zWG9Zc3wcAxJFSe2rtavVBYwZOfG09qYEx_4,472
 omlish/iterators/tools.py,sha256=c4hArZEVV8y9_dFfmRwakusv1cWJLT4MkTkGRjnGN5U,2556
 omlish/iterators/unique.py,sha256=Nw0pSaNEcHAkve0ugfLPvJcirDOn9ECyC5wIL8JlJKI,1395
-omlish/lang/__init__.py,sha256=KCzbT9IMWi2TNldAlDZ6b8Rr-7hyV9Ne6kIKJLXNAxg,5315
+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/clsdct.py,sha256=HAGIvBSbCefzRjXriwYSBLO7QHKRv2UsE78jixOb-fA,1828
 omlish/lang/collections.py,sha256=LVm0Sory60IXyFzYhhO8BZAWy_z_pjiA-meXNlSJP7o,2465
 omlish/lang/comparison.py,sha256=MOwEG0Yny-jBPHO9kQto9FSRyeNpQW24UABsghkrHxY,1356
@@ -483,7 +484,7 @@ omlish/lang/outcomes.py,sha256=mpFy_VoM-b74L1aCFsjsZVUHx_icZ1AHMOKeVesjOp4,8628
 omlish/lang/params.py,sha256=QmNVBfJsfxjDG5ilDPgHV7sK4UwRztkSQdLTo0umb8I,6648
 omlish/lang/resolving.py,sha256=ei9LDyJexsMMHB9z8diUkNmynWhd_da7h7TqrMYM6lA,1611
 omlish/lang/resources.py,sha256=WKkAddC3ctMK1bvGw-elGe8ZxAj2IaUTKVSu2nfgHTo,2839
-omlish/lang/strings.py,sha256=egdv8PxLNG40-5V93agP5j2rBUDIsahCx048zV7uEbU,4690
+omlish/lang/strings.py,sha256=kJmRFd1D36xXcjd9MdB12BCwF_-MVhNr-TpWj7hMi_4,4252
 omlish/lang/sys.py,sha256=b4qOPiJZQru_mbb04FNfOjYWUxlV2becZOoc-yya_rQ,411
 omlish/lang/typing.py,sha256=Zdad9Zv0sa-hIaUXPrzPidT7sDVpRcussAI7D-j-I1c,3296
 omlish/lang/cached/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -550,7 +551,7 @@ omlish/marshal/base.py,sha256=Q0ZRsz5z0NTI6PeWPc9mdMstJryDDbeIAdpKH9-SDps,11427
 omlish/marshal/errors.py,sha256=g5XJyTHd__8lfwQ4KwgK-E5WR6MoNTMrqKP2U_QRQQQ,307
 omlish/marshal/factories.py,sha256=Q926jSVjaQLEmStnHLhm_c_vqEysN1LnDCwAsFLIzXw,2970
 omlish/marshal/global_.py,sha256=sdBC6PbP77iUAYZ9GIYyAFrbmg14bp6iU3f1l5tpOSE,1378
-omlish/marshal/naming.py,sha256=lIklR_Od4x1ghltAgOzqcKhHs-leeSv2YmFhCHO7GIs,613
+omlish/marshal/naming.py,sha256=7jQ204u_Kpc3-OGr-ctUHSv997DdWYRLh643qLHJhks,852
 omlish/marshal/proxy.py,sha256=puKJpwPpuDlMOIrKMcLTRLJyMiL6n_Xs-p59AuDEymA,543
 omlish/marshal/registries.py,sha256=FvC6qXHCizNB2QmU_N3orxW7iqfGYkiUXYYdTRWS6HA,2353
 omlish/marshal/standard.py,sha256=TADR75Hd9VSUpuN_Tnu74Bzmvby42P2bzwFwUBC0l-Q,4283
@@ -679,7 +680,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=4jCK_WDf7mBwxAZY2AKAcLOJICQZCSL7Gny8-IplicA,16565
+omlish/specs/jmespath/visitor.py,sha256=HVro_6aBGL0CMBy8NRy6vJzWgwsHGB1qJXldX8H7wSg,16592
 omlish/specs/jsonrpc/__init__.py,sha256=QQwr-jkgvwr1ZMlNwl5W1TuHcxx8RuzQVFwWwNhp5sM,515
 omlish/specs/jsonrpc/errors.py,sha256=-Zgmlo6bV6J8w5f8h9axQgLquIFBHDgIwcpufEH5NsE,707
 omlish/specs/jsonrpc/marshal.py,sha256=HM736piPGnBZrg8CMLDX-L5fZpegyF6l6JUjzLoSDtk,1852
@@ -843,9 +844,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.dev302.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev302.dist-info/METADATA,sha256=ARPvC1-WLWPuw1QpgF2xijl-9JRU8BHBzFVsFadjAfg,4416
-omlish-0.0.0.dev302.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
-omlish-0.0.0.dev302.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev302.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev302.dist-info/RECORD,,
+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,,