omlish 0.0.0.dev206__py3-none-any.whl → 0.0.0.dev208__py3-none-any.whl

omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev206'
-__revision__ = 'fbe9fb697323f864d4e3a5eb2a999356f5e34f60'
+__version__ = '0.0.0.dev208'
+__revision__ = '0a5b99ece5c5a7d95c3ba0892f22ea9061ddad24'
 
 
 #

omlish/formats/xml.py

@@ -5,6 +5,7 @@ TODO:
 """
 import typing as ta
 
+from .. import cached
 from .. import dataclasses as dc
 from .. import lang
 
@@ -67,17 +68,51 @@ class SimpleElement:
     attrs: ta.Mapping[str, str] | None = dc.xfield(default=None, repr_fn=dc.truthy_repr)
     body: ta.Sequence[ta.Union['SimpleElement', str]] | None = dc.xfield(default=None, repr_fn=dc.truthy_repr)
 
-    def as_dict(self) -> dict[str, ta.Any]:
+    #
+
+    @cached.property
+    def has_children(self) -> bool:
+        return any(isinstance(c, SimpleElement) for c in self.body or ())
+
+    @cached.property
+    def children(self) -> ta.Sequence['SimpleElement']:
+        return [c for c in self.body or () if isinstance(c, SimpleElement)]
+
+    @cached.property
+    def text(self) -> str:
+        return ''.join(c for c in self.body or () if isinstance(c, str))
+
+    #
+
+    def se_dict(self) -> dict[str, ta.Any]:
         dct: dict[str, ta.Any] = {'tag': self.tag}
         if self.attrs:
             dct['attrs'] = self.attrs
         if self.body:
             dct['body'] = [
-                c.as_dict() if isinstance(c, SimpleElement) else c
+                c.se_dict() if isinstance(c, SimpleElement) else c
                 for c in self.body
             ]
         return dct
 
+    #
+
+    def multidict(self) -> dict[str, list[ta.Any]]:
+        dct: dict[str, list[ta.Any]] = {}
+
+        for ce in self.children:
+            try:
+                cl = dct[ce.tag]
+            except KeyError:
+                dct[ce.tag] = cl = []
+
+            if ce.has_children:
+                cl.append(ce.multidict())
+            elif ce.body:
+                cl.append(ce.text)
+
+        return dct
+
 
 def build_simple_element(
         element: 'ET.Element',

{omlish-0.0.0.dev206.dist-info → omlish-0.0.0.dev208.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: omlish
-Version: 0.0.0.dev206
+Version: 0.0.0.dev208
 Summary: omlish
 Author: wrmsr
 License: BSD-3-Clause

{omlish-0.0.0.dev206.dist-info → omlish-0.0.0.dev208.dist-info}/RECORD

@@ -1,5 +1,5 @@
 omlish/.manifests.json,sha256=dyIpveH7Z8OnQp2pTn6NVv7LCDXVrozJWAzbk8PBavg,7950
-omlish/__about__.py,sha256=HkupIc8CpzVWpOlDHjAm9pefevlmAr3JF8jUolA3iF4,3409
+omlish/__about__.py,sha256=22uMA2RLBxbw-IZsPLk4nnvlh3wHoCRD06wQw3bBZIQ,3409
 omlish/__init__.py,sha256=SsyiITTuK0v74XpKV8dqNaCmjOlan1JZKrHQv5rWKPA,253
 omlish/c3.py,sha256=ubu7lHwss5V4UznbejAI0qXhXahrU01MysuHOZI9C4U,8116
 omlish/cached.py,sha256=UI-XTFBwA6YXWJJJeBn-WkwBkfzDjLBBaZf4nIJA9y0,510
@@ -228,7 +228,7 @@ omlish/formats/json5.py,sha256=odpZIShlUpv19aACWe58SoMPcv0AHKIa6zSMjlKgaMI,515
 omlish/formats/pickle.py,sha256=jdp4E9WH9qVPBE3sSqbqDtUo18RbTSIiSpSzJ-IEVZw,529
 omlish/formats/props.py,sha256=auCv-Jx79KGlWfyG1-Qo0ou-Ex0W_mF3r_lDFdsVkWI,18920
 omlish/formats/repr.py,sha256=kYrNs4o-ji8nOdp6u_L3aMgBMWN1ZAZJSAWgQQfStSQ,414
-omlish/formats/xml.py,sha256=rKXN1RDJV-jliM4fZ2NtmsujB5cAGQBMzRHRHEnH9Ko,2661
+omlish/formats/xml.py,sha256=VJfqHR60dhAtjeG8WXFMozFqesTBSGvv264d67eDFXc,3514
 omlish/formats/yaml.py,sha256=ffOwGnLA6chdiFyaS7X0TBMGmHG9AoGudzKVWfQ1UOs,7389
 omlish/formats/ini/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 omlish/formats/ini/codec.py,sha256=omuFg0kiDksv8rRlWd_v32ebzEcKlgmiPgGID3bRi2M,631
@@ -609,9 +609,9 @@ omlish/text/indent.py,sha256=YjtJEBYWuk8--b9JU_T6q4yxV85_TR7VEVr5ViRCFwk,1336
 omlish/text/minja.py,sha256=jZC-fp3Xuhx48ppqsf2Sf1pHbC0t8XBB7UpUUoOk2Qw,5751
 omlish/text/parts.py,sha256=7vPF1aTZdvLVYJ4EwBZVzRSy8XB3YqPd7JwEnNGGAOo,6495
 omlish/text/random.py,sha256=jNWpqiaKjKyTdMXC-pWAsSC10AAP-cmRRPVhm59ZWLk,194
-omlish-0.0.0.dev206.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-omlish-0.0.0.dev206.dist-info/METADATA,sha256=UGV5-pANwtpbaBPJMYzB7MGk-5ZDkEngcGS3p1Fcnl8,4264
-omlish-0.0.0.dev206.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
-omlish-0.0.0.dev206.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
-omlish-0.0.0.dev206.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
-omlish-0.0.0.dev206.dist-info/RECORD,,
+omlish-0.0.0.dev208.dist-info/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+omlish-0.0.0.dev208.dist-info/METADATA,sha256=56HyCquMSUilt7VYCVusiCr6AXg2OuCrQwdxK4YXVbc,4264
+omlish-0.0.0.dev208.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+omlish-0.0.0.dev208.dist-info/entry_points.txt,sha256=Lt84WvRZJskWCAS7xnQGZIeVWksprtUHj0llrvVmod8,35
+omlish-0.0.0.dev208.dist-info/top_level.txt,sha256=pePsKdLu7DvtUiecdYXJ78iO80uDNmBlqe-8hOzOmfs,7
+omlish-0.0.0.dev208.dist-info/RECORD,,