Add type constraints and support generator expressions

Author: MaddyGuthridge

meta/generate_tag_defs.py

@@ -47,7 +47,7 @@ def generate_tag_class(output: TextIO, tag: TagInfo):
             # Yucky hard-coded spaces, I can't be bothered to fix this
             # Also making everything optional for the sake of users always
             # being able to remove an attribute
-            f"        {attr.name}: Optional[{attr.type}] = None,"
+            f"        {attr.name}: {attr.type} = None,"
         )
         attr_unions_gen.append(f"            '{attr.name}': {attr.name},")
         # Also mention default value if applicable

meta/scrape_tags.py

@@ -380,7 +380,7 @@ def attr_entries_to_object(tags: TagsYaml, tag_name: str) -> list[Attr]:
         if isinstance(value, str):
             doc: Optional[str] = value
             default: Optional[str] = None
-            type = "Any"
+            type = "AttributeType"
         else:
             doc = value.get("doc")
             if "default" in value:
@@ -389,7 +389,7 @@ def attr_entries_to_object(tags: TagsYaml, tag_name: str) -> list[Attr]:
                 default = eval(value["default"])
             else:
                 default = None
-            type = value.get("type", "Any")
+            type = value.get("type", "AttributeType")
         attrs.append(Attr(name, doc, type, default))
     return attrs
 

meta/tags.yml

@@ -14,32 +14,43 @@ base:
 link:
   base: SelfClosingTag
   attributes:
-    href: Location of the file being linked to
-    rel: Kind of file being loaded (eg `"stylesheet"`)
+    href:
+      doc: Location of the file being linked to
+      type: Optional[str]
+    rel:
+      doc: Kind of file being loaded (eg `"stylesheet"`)
+      type: Optional[str]
 
 a:
   base: StylableTag
   attributes:
-    href: URL of page to link to
-    target: Use "_blank" to open in a new tab
+    href:
+      doc: URL of page to link to
+      type: Optional[str]
+    target:
+      doc: Use "_blank" to open in a new tab
+      type: "Union[str, Literal['_self', '_blank', '_parent', '_top'], None]"
 
 script:
   attributes:
     type:
       doc: Type of script to use
       default: "'text/javascript'"
+      type: Optional[str]
 
 style:
   attributes:
     type:
       doc: Type of style to use
       default: "'text/css'"
+      type: Optional[str]
 
 form:
   attributes:
     method:
       doc: The HTTP request method to use when submitting this form. In almost all cases, you'll want this to be POST.
-      default: "'POST'"
+      default: "'post'"
+      type: "Optional[Literal['post', 'get']]"
     action: The URL to request to when submitting this form. By default, requests will be sent to the same URL as the current page.
 
 input:

meta/templates/class_attrs_SelfClosingTag.py

@@ -10,7 +10,7 @@ def __init__(
         self,
         {kw_only}
         {attr_args}
-        **attributes: Any,
+        **attributes: AttributeType,
     ) -> None:
         """
         {description}
@@ -24,11 +24,11 @@ def __init__(
         }
         super().__init__(**attributes)
 
-    def __call__(
+    def __call__(  # type: ignore
         self,
         {kw_only}
         {attr_args}
-        **attributes: Any,
+        **attributes: AttributeType,
     ):
         """
         {description}
@@ -42,5 +42,5 @@ def __call__(
         }
         return super().__call__(**attributes)
 
-    def _get_default_attributes(self, given: dict[str, Any]) -> dict[str, Any]:
+    def _get_default_attributes(self, given: dict[str, AttributeType]) -> dict[str, AttributeType]:
         return {default_attrs}

meta/templates/class_attrs_StylableTag.py

@@ -1,4 +1,4 @@
-class {name}({base}):
+class {name}(Tag):
     """
     {description}
 
@@ -8,12 +8,12 @@ class {name}({base}):
     """
     def __init__(
         self,
-        *children,
+        *children: ChildrenType,
         {attr_args}
-        id: Any = None,
-        _class: Any = None,
-        style: Any = None,
-        **attributes: Any,
+        id: Optional[str] = None,
+        _class: Optional[str] = None,
+        style: Optional[str] = None,
+        **attributes: AttributeType,
     ) -> None:
         """
         {description}
@@ -30,14 +30,14 @@ def __init__(
         }
         super().__init__(*children, **attributes)
 
-    def __call__(
+    def __call__(  # type: ignore
         self,
-        *children,
+        *children: ChildrenType,
         {attr_args}
-        id: Any = None,
-        _class: Any = None,
-        style: Any = None,
-        **attributes: Any,
+        id: Optional[str] = None,
+        _class: Optional[str] = None,
+        style: Optional[str] = None,
+        **attributes: AttributeType,
     ):
         """
         {description}
@@ -54,5 +54,5 @@ def __call__(
         }
         return super().__call__(*children, **attributes)
 
-    def _get_default_attributes(self, given: dict[str, Any]) -> dict[str, Any]:
+    def _get_default_attributes(self, given: dict[str, AttributeType]) -> dict[str, AttributeType]:
         return {default_attrs}

meta/templates/class_attrs_Tag.py

@@ -8,9 +8,9 @@ class {name}({base}):
     """
     def __init__(
         self,
-        *children: Any,
+        *children: ChildrenType,
         {attr_args}
-        **attributes: Any,
+        **attributes: AttributeType,
     ) -> None:
         """
         {description}
@@ -24,11 +24,11 @@ def __init__(
         }
         super().__init__(*children, **attributes)
 
-    def __call__(
+    def __call__(  # type: ignore
         self,
-        *children: Any,
+        *children: ChildrenType,
         {attr_args}
-        **attributes: Any,
+        **attributes: AttributeType,
     ):
         """
         {description}
@@ -42,5 +42,5 @@ def __call__(
         }
         return super().__call__(*children, **attributes)
 
-    def _get_default_attributes(self, given: dict[str, Any]) -> dict[str, Any]:
+    def _get_default_attributes(self, given: dict[str, AttributeType]) -> dict[str, AttributeType]:
         return {default_attrs}

meta/templates/main.py

@@ -1,5 +1,3 @@
-# type: ignore
-# flake8: noqa
 """
 # PyHTML Enhanced / Tags / Generated
 
@@ -9,5 +7,6 @@
 
 https://creativecommons.org/licenses/by-sa/2.5/
 """
-from typing import Any, Optional
-from ..__tag_base import Tag, SelfClosingTag, StylableTag
+from typing import Any, Optional, Union, Literal
+from ..__tag_base import Tag, SelfClosingTag
+from ..__types import AttributeType, ChildrenType