python-fasthtml 0.2.2__tar.gz → 0.2.3__tar.gz

{python-fasthtml-0.2.2/python_fasthtml.egg-info → python-fasthtml-0.2.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-fasthtml
-Version: 0.2.2
+Version: 0.2.3
 Summary: The fastest way to create an HTML app
 Home-page: https://github.com/AnswerDotAI/fasthtml
 Author: Jeremy Howard

{python-fasthtml-0.2.2 → python-fasthtml-0.2.3}/fasthtml/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.2.2"
+__version__ = "0.2.3"
 from .core import *
 from .authmw import *
 from .components import *

{python-fasthtml-0.2.2 → python-fasthtml-0.2.3}/fasthtml/components.py

@@ -82,7 +82,7 @@ def _fill_item(item, obj):
                 else: attr.pop('checked', '')
             else: attr['value'] = val
         if tag=='textarea': cs=(val,)
-    return FT(tag,cs,attr)
+    return FT(tag,cs,attr,void_=item.void_)
 
 # %% ../nbs/api/01_components.ipynb
 def fill_form(form:FT, obj)->FT:
@@ -120,7 +120,7 @@ def __getattr__(tag):
 
 # %% ../nbs/api/01_components.ipynb
 _re_h2x_attr_key = re.compile(r'^[A-Za-z_-][\w-]*$')
-def html2ft(html):
+def html2ft(html, attr1st=False):
     """Convert HTML to an `ft` expression"""
     rev_map = {'class': 'cls', 'for': 'fr'}
     
@@ -136,13 +136,17 @@ def html2ft(html):
         for key, value in sorted(elm.attrs.items(), key=lambda x: x[0]=='class'):
             if isinstance(value,(tuple,list)): value = " ".join(value)
             key = rev_map.get(key, key)
-            attrs.append(f'{key.replace("-", "_")}={value!r}' if _re_h2x_attr_key.match(key) else f'**{{{key!r}:{value!r}}}')
+            attrs.append(f'{key.replace("-", "_")}={value!r}'
+                         if _re_h2x_attr_key.match(key) else f'**{{{key!r}:{value!r}}}')
         spc = " "*lvl*indent
         onlychild = not cts or (len(cts)==1 and isinstance(cts[0],str))
         j = ', ' if onlychild else f',\n{spc}'
         inner = j.join(filter(None, cs+attrs))
         if onlychild: return f'{tag_name}({inner})'
-        return f'{tag_name}(\n{spc}{inner}\n{" "*(lvl-1)*indent})'
+        if not attr1st or not attrs: return f'{tag_name}(\n{spc}{inner}\n{" "*(lvl-1)*indent})' 
+        inner_cs = j.join(filter(None, cs))
+        inner_attrs = ', '.join(filter(None, attrs))
+        return f'{tag_name}({inner_attrs})(\n{spc}{inner_cs}\n{" "*(lvl-1)*indent})'
 
     soup = BeautifulSoup(html.strip(), 'html.parser')
     for c in soup.find_all(string=risinstance(Comment)): c.extract()

{python-fasthtml-0.2.2 → python-fasthtml-0.2.3/python_fasthtml.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-fasthtml
-Version: 0.2.2
+Version: 0.2.3
 Summary: The fastest way to create an HTML app
 Home-page: https://github.com/AnswerDotAI/fasthtml
 Author: Jeremy Howard

{python-fasthtml-0.2.2 → python-fasthtml-0.2.3}/settings.ini

@@ -1,7 +1,7 @@
 [DEFAULT]
 repo = fasthtml
 lib_name = fasthtml
-version = 0.2.2
+version = 0.2.3
 min_python = 3.10
 license = apache2
 requirements = fastcore>=1.6.3 python-dateutil starlette>0.33 oauthlib itsdangerous uvicorn[standard]>=0.30 httpx fastlite>=0.0.6 python-multipart beautifulsoup4