fixes #552

Author: jph00

fastcore/_modidx.py

@@ -534,7 +534,13 @@
                               'fastcore.xdg.xdg_data_home': ('xdg.html#xdg_data_home', 'fastcore/xdg.py'),
                               'fastcore.xdg.xdg_runtime_dir': ('xdg.html#xdg_runtime_dir', 'fastcore/xdg.py'),
                               'fastcore.xdg.xdg_state_home': ('xdg.html#xdg_state_home', 'fastcore/xdg.py')},
-            'fastcore.xml': { 'fastcore.xml._attrmap': ('xml.html#_attrmap', 'fastcore/xml.py'),
+            'fastcore.xml': { 'fastcore.xml.Checkbox': ('xml.html#checkbox', 'fastcore/xml.py'),
+                              'fastcore.xml.Hidden': ('xml.html#hidden', 'fastcore/xml.py'),
+                              'fastcore.xml.XT': ('xml.html#xt', 'fastcore/xml.py'),
+                              'fastcore.xml._attrmap': ('xml.html#_attrmap', 'fastcore/xml.py'),
+                              'fastcore.xml.fill_dataclass': ('xml.html#fill_dataclass', 'fastcore/xml.py'),
+                              'fastcore.xml.fill_form': ('xml.html#fill_form', 'fastcore/xml.py'),
+                              'fastcore.xml.set_val': ('xml.html#set_val', 'fastcore/xml.py'),
                               'fastcore.xml.to_xml': ('xml.html#to_xml', 'fastcore/xml.py'),
                               'fastcore.xml.xt': ('xml.html#xt', 'fastcore/xml.py')},
             'fastcore.xtras': { 'fastcore.xtras.ContextManagers': ('xtras.html#contextmanagers', 'fastcore/xtras.py'),

fastcore/xml.py

@@ -1,17 +1,19 @@
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/11_xml.ipynb.
 
 # %% auto 0
-__all__ = ['voids', 'xt', 'to_xml', 'Html', 'Head', 'Title', 'Meta', 'Link', 'Style', 'Body', 'Pre', 'Code', 'Div', 'Span', 'P',
-           'H1', 'H2', 'H3', 'H4', 'H5', 'H6', 'Strong', 'Em', 'B', 'I', 'U', 'S', 'Strike', 'Sub', 'Sup', 'Hr', 'Br',
-           'Img', 'A', 'Nav', 'Ul', 'Ol', 'Li', 'Dl', 'Dt', 'Dd', 'Table', 'Thead', 'Tbody', 'Tfoot', 'Tr', 'Th', 'Td',
-           'Caption', 'Col', 'Colgroup', 'Form', 'Input', 'Textarea', 'Button', 'Select', 'Option', 'Label', 'Fieldset',
-           'Legend', 'Details', 'Summary', 'Main', 'Header', 'Footer', 'Section', 'Article', 'Aside', 'Figure',
-           'Figcaption', 'Mark', 'Small', 'Iframe', 'Object', 'Embed', 'Param', 'Video', 'Audio', 'Source', 'Canvas',
-           'Svg', 'Math', 'Script', 'Noscript', 'Template', 'Slot']
+__all__ = ['named', 'voids', 'XT', 'xt', 'Checkbox', 'Hidden', 'to_xml', 'set_val', 'fill_form', 'fill_dataclass', 'Html', 'Head',
+           'Title', 'Meta', 'Link', 'Style', 'Body', 'Pre', 'Code', 'Div', 'Span', 'P', 'H1', 'H2', 'H3', 'H4', 'H5',
+           'H6', 'Strong', 'Em', 'B', 'I', 'U', 'S', 'Strike', 'Sub', 'Sup', 'Hr', 'Br', 'Img', 'A', 'Nav', 'Ul', 'Ol',
+           'Li', 'Dl', 'Dt', 'Dd', 'Table', 'Thead', 'Tbody', 'Tfoot', 'Tr', 'Th', 'Td', 'Caption', 'Col', 'Colgroup',
+           'Form', 'Input', 'Textarea', 'Button', 'Select', 'Option', 'Label', 'Fieldset', 'Legend', 'Details',
+           'Summary', 'Main', 'Header', 'Footer', 'Section', 'Article', 'Aside', 'Figure', 'Figcaption', 'Mark',
+           'Small', 'Iframe', 'Object', 'Embed', 'Param', 'Video', 'Audio', 'Source', 'Canvas', 'Svg', 'Math', 'Script',
+           'Noscript', 'Template', 'Slot']
 
 # %% ../nbs/11_xml.ipynb 2
 from .utils import *
 
+from dataclasses import dataclass, asdict
 import types
 from functools import partial
 from html import escape
@@ -22,13 +24,20 @@ def _attrmap(o):
     return o.lstrip('_').replace('_', '-')
 
 # %% ../nbs/11_xml.ipynb 5
+named = set('a button form frame iframe img input map meta object param select textarea'.split())
+
+# %% ../nbs/11_xml.ipynb 6
+class XT(list): patch
+
+# %% ../nbs/11_xml.ipynb 7
 def xt(tag:str, *c, **kw):
     "Create an XML tag structure `[tag,children,attrs]` for `toxml()`"
     if len(c)==1 and isinstance(c[0], types.GeneratorType): c = tuple(c[0])
     kw = {_attrmap(k):str(v) for k,v in kw.items()}
-    return [tag.lower(),c,kw]
+    if tag in named and 'id' in kw and 'name' not in kw: kw['name'] = kw['id']
+    return XT([tag.lower(),c,kw])
 
-# %% ../nbs/11_xml.ipynb 6
+# %% ../nbs/11_xml.ipynb 8
 _g = globals()
 _all_ = ['Html', 'Head', 'Title', 'Meta', 'Link', 'Style', 'Body', 'Pre', 'Code',
 'Div', 'Span', 'P', 'H1', 'H2', 'H3', 'H4', 'H5', 'H6', 'Strong', 'Em', 'B',
@@ -42,10 +51,19 @@ def xt(tag:str, *c, **kw):
 
 for o in _all_: _g[o] = partial(xt, o.lower())
 
-# %% ../nbs/11_xml.ipynb 9
+# %% ../nbs/11_xml.ipynb 13
+def Checkbox(value:bool=False, **kw):
+    checked = {"checked":"1"} if value else {}
+    return Input(type="checkbox", **checked, **kw)
+
+# %% ../nbs/11_xml.ipynb 14
+def Hidden(value:str="", **kw):
+    return Input(type="hidden", value=value, **kw)
+
+# %% ../nbs/11_xml.ipynb 15
 voids = set('area base br col command embed hr img input keygen link meta param source track wbr'.split())
 
-# %% ../nbs/11_xml.ipynb 10
+# %% ../nbs/11_xml.ipynb 16
 def to_xml(elm, lvl=0):
     "Convert `xt` element tree into an XML string"
     if isinstance(elm, tuple): return '\n'.join(to_xml(o) for o in elm)
@@ -67,3 +85,26 @@ def to_xml(elm, lvl=0):
     res += ''.join(to_xml(c, lvl=lvl+2) for c in cs)
     if tag not in voids: res += f'{sp}{cltag}\n'
     return res
+
+# %% ../nbs/11_xml.ipynb 21
+def set_val(tag, attr, val):
+    if attr.get('type', '') in ('checkbox','radio'):
+        if val: attr['checked'] = '1'
+        else: attr.pop('checked', '')
+    else: attr['value'] = val
+
+# %% ../nbs/11_xml.ipynb 22
+def fill_form(form, obj):
+    "Modifies form in-place and returns it"
+    inps = {attrs['id']:(tag,attrs) for tag,c,attrs in form[1] if 'id' in attrs}
+    for nm,val in asdict(obj).items():
+        if nm in inps:
+            tag,attr = inps[nm]
+            set_val(tag, attr, val)
+    return form
+
+# %% ../nbs/11_xml.ipynb 24
+def fill_dataclass(src, dest):
+    "Modifies dataclass in-place and returns it"
+    for nm,val in asdict(src).items(): setattr(dest, nm, val)
+    return dest