fixes #590

jph00 · jph00 · commit 9ff049d68a91 · 2024-08-03T15:54:18.000+10:00
diff --git a/fastcore/_modidx.py b/fastcore/_modidx.py
@@ -561,6 +561,7 @@
                               '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.FT': ('xml.html#ft', 'fastcore/xml.py'),
+                              'fastcore.xml.FT.__call__': ('xml.html#ft.__call__', 'fastcore/xml.py'),
                               'fastcore.xml.FT.__getattr__': ('xml.html#ft.__getattr__', 'fastcore/xml.py'),
                               'fastcore.xml.FT.__init__': ('xml.html#ft.__init__', 'fastcore/xml.py'),
                               'fastcore.xml.FT.__setattr__': ('xml.html#ft.__setattr__', 'fastcore/xml.py'),
diff --git a/fastcore/xml.py b/fastcore/xml.py
@@ -29,6 +29,7 @@ def _attrmap(o):
 class FT(list):
     "A 'Fast Tag' structure, which is a `list` of `[tag,children,attrs]`"
     def __init__(self, tag, cs, attrs=None, void_=False, **kwargs):
+        assert isinstance(cs, tuple)
         super().__init__([tag, cs, {**(attrs or {}), **kwargs}])
         self.void_ = void_
 
@@ -46,6 +47,10 @@ def __setattr__(self, k, v):
     def __getattr__(self, k):
         if k.startswith('__') or k not in self.attrs: raise AttributeError(k)
         return self.attrs[k.lstrip('_').replace('_', '-')]
+    
+    def __call__(self, *c):
+        self[1] = self[1]+c
+        return self
 
 # %% ../nbs/11_xml.ipynb
 def ft(tag:str, *c, void_=False, **kw):
diff --git a/nbs/11_xml.ipynb b/nbs/11_xml.ipynb
@@ -74,6 +74,7 @@
     "class FT(list):\n",
     "    \"A 'Fast Tag' structure, which is a `list` of `[tag,children,attrs]`\"\n",
     "    def __init__(self, tag, cs, attrs=None, void_=False, **kwargs):\n",
+    "        assert isinstance(cs, tuple)\n",
     "        super().__init__([tag, cs, {**(attrs or {}), **kwargs}])\n",
     "        self.void_ = void_\n",
     "\n",
@@ -90,7 +91,11 @@
     "\n",
     "    def __getattr__(self, k):\n",
     "        if k.startswith('__') or k not in self.attrs: raise AttributeError(k)\n",
-    "        return self.attrs[k.lstrip('_').replace('_', '-')]"
+    "        return self.attrs[k.lstrip('_').replace('_', '-')]\n",
+    "    \n",
+    "    def __call__(self, *c):\n",
+    "        self[1] = self[1]+c\n",
+    "        return self"
    ]
   },
   {
@@ -396,6 +401,62 @@
     "    return _f"
    ]
   },
+  {
+   "cell_type": "markdown",
+   "id": "9786e4d9",
+   "metadata": {},
+   "source": [
+    "You can also reorder the children to come *after* the attrs, if you use this alternative syntax for `FT` where the children are in a second pair of `()` (behind the scenes this is because `FT` implements `__call__` to add children)."
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": null,
+   "id": "efd647f8",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/markdown": [
+       "```xml\n",
+       "<body class=\"myclass\">\n",
+       "  <div style=\"padding:3px\">\n",
+       "Some text \n",
+       "    <i>in italics</i>\n",
+       "    <input name=\"me\"></input>\n",
+       "    <img src=\"filename\" data=\"1\"></img>\n",
+       "  </div>\n",
+       "</body>\n",
+       "\n",
+       "```"
+      ],
+      "text/plain": [
+       "['body',\n",
+       " (['div',\n",
+       "   ('Some text ',\n",
+       "    ['i', ('in italics',), {}],\n",
+       "    ['input', (), {'name': 'me'}],\n",
+       "    ['img', (), {'src': 'filename', 'data': 1}]),\n",
+       "   {'style': 'padding:3px'}],),\n",
+       " {'class': 'myclass'}]"
+      ]
+     },
+     "execution_count": null,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "Body(klass='myclass')(\n",
+    "    Div(style='padding:3px')(\n",
+    "        'Some text ',\n",
+    "        I('in italics'),\n",
+    "        Input(name='me'),\n",
+    "        Img(src=\"filename\", data=1)\n",
+    "    )\n",
+    ")"
+   ]
+  },
   {
    "cell_type": "markdown",
    "id": "df973d4e",
