omlish 0.0.0.dev270__py3-none-any.whl → 0.0.0.dev271__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev270'
-__revision__ = 'ac26cb82cb30f878a10324fe1bf518f6a0b4b87f'
+__version__ = '0.0.0.dev271'
+__revision__ = 'fc242f5a994ee5dd88268a5720ed88792d17c61f'
 
 
 #

omlish/dataclasses/impl/api.py

@@ -11,6 +11,7 @@ import types
 import typing as ta
 
 from ... import check as check_
+from ... import lang
 from .internals import PARAMS_ATTR
 from .internals import Params
 from .main import process_class
@@ -40,20 +41,26 @@ def field(  # noqa
         check_type: bool | type | tuple[type | None, ...] | None = None,
         override: bool = False,
         repr_fn: ta.Callable[[ta.Any], str | None] | None = None,
+        repr_priority: int | None = None,
         frozen: bool | None = None,
 ):  # -> dc.Field
     if default is not MISSING and default_factory is not MISSING:
         raise ValueError('cannot specify both default and default_factory')
 
-    fx = FieldExtras(
+    fx = FieldExtras()
+    if metadata is not None:
+        fx = metadata.get(FieldExtras, fx)
+
+    fx = dc.replace(fx, **lang.opt_kw(
         derive=derive,
         coerce=coerce,
         validate=validate,
         check_type=check_type,
         override=override,
         repr_fn=repr_fn,
+        repr_priority=repr_priority,
         frozen=frozen,
-    )
+    ))
 
     md: ta.Mapping = {FieldExtras: fx}
     if metadata is not None:

omlish/dataclasses/impl/params.py

@@ -53,6 +53,7 @@ class FieldExtras(lang.Final):
     check_type: bool | type | tuple[type | None, ...] | None = None
     override: bool = False
     repr_fn: ta.Callable[[ta.Any], str | None] | None = None
+    repr_priority: int | None = None
     frozen: bool | None = None  # TODO
 
 

omlish/dataclasses/impl/repr.py

@@ -14,6 +14,9 @@ def repr_fn(
         globals: Namespace,  # noqa
 ) -> ta.Callable:
     locals: dict[str, ta.Any] = {}  # noqa
+
+    fields = sorted(fields, key=lambda f: get_field_extras(f).repr_priority or 0)
+
     if any(get_field_extras(f).repr_fn is not None for f in fields):
         lst: list[str] = []
         for f in fields:
@@ -22,17 +25,20 @@ def repr_fn(
                 lst.append(f"if (r := {fn_name}(self.{f.name})) is not None: l.append(f'{f.name}={{r}}')")
             else:
                 lst.append(f"l.append(f'{f.name}={{self.{f.name}!r}}')")
+
         src = [
             'l = []',
             *lst,
             'return f"{self.__class__.__qualname__}({", ".join(l)})"',
         ]
+
     else:
         src = [
             'return f"{self.__class__.__qualname__}(' +
             ', '.join([f'{f.name}={{self.{f.name}!r}}' for f in fields]) +
             ')"',
         ]
+
     fn = create_fn(
         '__repr__',
         ('self',),
@@ -40,6 +46,7 @@ def repr_fn(
         globals=globals,
         locals=locals,
     )
+
     return reprlib.recursive_repr()(fn)
 
 

{omlish-0.0.0.dev270.dist-info → omlish-0.0.0.dev271.dist-info}/METADATA

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

{omlish-0.0.0.dev270.dist-info → omlish-0.0.0.dev271.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=x26AIwDzScUvnX-p4xlq6Zc5QYrAo0Vmgf1qHc1KL_M,8253
-omlish/__about__.py,sha256=OR-PRiAN7dudUKnLMzl2lt9Y5bh8Gy1c1V-wJvtHqLA,3380
+omlish/__about__.py,sha256=a-BsHYkG1XmGNuahLQVSE6wR7i-00PDzWGTjEenZsC0,3380
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=rer-TPOFDU6fYq_AWio_AmA-ckZ8JDY5shIzQ_yXfzA,8414
 omlish/cached.py,sha256=MLap_p0rdGoDIMVhXVHm1tsbcWobJF0OanoodV03Ju8,542
@@ -206,7 +206,7 @@ omlish/dataclasses/static.py,sha256=6pZG2iTR9NN8pKm-5ukDABnaVlTKFOzMwkg-rbxURoo,
 omlish/dataclasses/utils.py,sha256=BTXYyH0enSEP5kWxMnPTJ8_UPd7h4wF2RVPITNC8H4M,3872
 omlish/dataclasses/impl/LICENSE,sha256=Oy-B_iHRgcSZxZolbI4ZaEVdZonSaaqFNzv7avQdo78,13936
 omlish/dataclasses/impl/__init__.py,sha256=zqGBC5gSbjJxaqG_zS1LL1PX-zAfhIua8UqOE4IwO2k,789
-omlish/dataclasses/impl/api.py,sha256=RhU4f50GVdn-dxilia8NA3F7VIm2R5z78pFfpIVXPRQ,6635
+omlish/dataclasses/impl/api.py,sha256=Sl3DhCLn8KCvsXAOahr7VP_EH9XqBu9TBt3MQ9WqLbo,6849
 omlish/dataclasses/impl/as_.py,sha256=CD-t7hkC1EP2F_jvZKIA_cVoDuwZ-Ln_xC4fJumPYX0,2598
 omlish/dataclasses/impl/copy.py,sha256=Tn8_n6Vohs-w4otbGdubBEvhd3TsSTaM3EfNGdS2LYo,591
 omlish/dataclasses/impl/descriptors.py,sha256=jSYNkKdy2rKddGpQqRwNuhw-ggpcvp_SWHpLwIWPOzc,2474
@@ -221,11 +221,11 @@ omlish/dataclasses/impl/metaclass.py,sha256=ebxJr3j8d_wz-fc7mvhWtJ6wJgnxVV6rVOQd
 omlish/dataclasses/impl/metadata.py,sha256=4veWwTr-aA0KP-Y1cPEeOcXHup9EKJTYNJ0ozIxtzD4,1401
 omlish/dataclasses/impl/order.py,sha256=zWvWDkSTym8cc7vO1cLHqcBhhjOlucHOCUVJcdh4jt0,1369
 omlish/dataclasses/impl/overrides.py,sha256=g9aCzaDDKyek8-yXRvtAcu1B1nCphWDYr4InHDlgbKk,1732
-omlish/dataclasses/impl/params.py,sha256=9EHn7PxqPVtRPcNDNDCsbcmxvkezWR5LzLLxCua2Vok,2946
+omlish/dataclasses/impl/params.py,sha256=lmZkxZlZWPEPXmC-__P_3ZZeyL7IoQxli15mM3kUUsU,2983
 omlish/dataclasses/impl/processing.py,sha256=DFxyFjL_h3awRyF_5eyTnB8QkuApx7Zc4QFnVoltlao,459
 omlish/dataclasses/impl/reflect.py,sha256=1PTxx3ycsWhC3oAV71mW-ZquDRwa2-t9uIaKFO8ab8U,5468
 omlish/dataclasses/impl/replace.py,sha256=wS9GHX4fIwaPv1JBJzIewdBfXyK3X3V7_t55Da87dYo,1217
-omlish/dataclasses/impl/repr.py,sha256=oLXBTxqp88NKmz82HrJeGiTEiwK4l5LlXQT9Q0-tX3c,1605
+omlish/dataclasses/impl/repr.py,sha256=D6Rnz0tWf8Qy9abIFVV0x1UQFF9ERJd4VsyHmQ9Y2g0,1693
 omlish/dataclasses/impl/simple.py,sha256=Q272TYXifB5iKtydByxyzraeQHX6aXDY0VKO1-AKBF4,1771
 omlish/dataclasses/impl/slots.py,sha256=qXRLbtFWUs_2UV1fFUdv53_6fBLKJ_8McjNiP9YQlGM,5264
 omlish/dataclasses/impl/utils.py,sha256=aER2iL3UAtgS1BdLuEvTr9Tr2wC28wk1kiOeO-jIymw,6138
@@ -776,9 +776,9 @@ omlish/text/parts.py,sha256=Q9NvoyEGQKIWgiPD4D_Qc66cWAuyEKE033dT9m7c3Wk,6662
 omlish/text/random.py,sha256=8feS5JE_tSjYlMl-lp0j93kCfzBae9AM2cXlRLebXMA,199
 omlish/text/go/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/text/go/quoting.py,sha256=N9EYdnFdEX_A8fOviH-1w4jwV3XOQ7VU2WsoUNubYVY,9137
-omlish-0.0.0.dev270.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev270.dist-info/METADATA,sha256=yrRv07ARNclD2q_004yblEKJRqGAi5VuRPhmU21-rhU,4198
-omlish-0.0.0.dev270.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-omlish-0.0.0.dev270.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev270.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev270.dist-info/RECORD,,
+omlish-0.0.0.dev271.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev271.dist-info/METADATA,sha256=SXISrSK-Lmc1Z9EwMNS_ex2iPPZeBFhAoayeCdlukGw,4198
+omlish-0.0.0.dev271.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+omlish-0.0.0.dev271.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev271.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev271.dist-info/RECORD,,