omlish 0.0.0.dev207__tar.gz → 0.0.0.dev209__tar.gz

{omlish-0.0.0.dev207/omlish.egg-info → omlish-0.0.0.dev209}/PKG-INFO

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

{omlish-0.0.0.dev207 → omlish-0.0.0.dev209}/omlish/__about__.py

@@ -1,5 +1,5 @@
-__version__ = '0.0.0.dev207'
-__revision__ = 'beb43e7bf617a8e7c0e1074a556dbb12f8ec5b9e'
+__version__ = '0.0.0.dev209'
+__revision__ = '314f6224b877d8afdb8708faee9e19b7c81cdd0f'
 
 
 #

{omlish-0.0.0.dev207 → omlish-0.0.0.dev209}/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.dev207 → omlish-0.0.0.dev209/omlish.egg-info}/PKG-INFO

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

{omlish-0.0.0.dev207 → omlish-0.0.0.dev209}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '>=3.12'
-version = '0.0.0.dev207'
+version = '0.0.0.dev209'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',