Make input tag specify formmethod when formaction is given

Author: MaddyGuthridge

meta/scrape_tags.py

@@ -121,6 +121,9 @@ class TagsYmlItem(TypedDict):
     """
     A tag which has suggested keys
     """
+    skip: NotRequired[bool]
+    """Whether to skip this tag when generating tags"""
+
     attributes: NotRequired[dict[str, Union[str, AttrYmlItem]]]
     """Mapping of attributes used by the tag (name: description)"""
 
@@ -418,6 +421,16 @@ def get_tag_base_class(tags: TagsYaml, tag_name: str) -> str:
         return tag['base']
 
 
+def get_tag_skip(tags: TagsYaml, tag_name: str) -> bool:
+    """
+    Return whether to skip this tag
+    """
+    if tag_name not in tags:
+        return False
+    tag = tags[tag_name]
+    return tag.get('skip', False)
+
+
 def make_mdn_link(tag: str) -> str:
     """Generate an MDN docs link for the given tag"""
     return f"{MDN_ELEMENT_PAGE}/{tag}"
@@ -433,6 +446,10 @@ def elements_to_element_structs(
     output = []
 
     for name, description in mdn_data:
+        # Skip tag if specified
+        if get_tag_skip(tag_attrs, name):
+            continue
+
         output.append(TagInfo(
             name=get_tag_rename(tag_attrs, name),
             description=description,

meta/tags.yml

@@ -43,22 +43,7 @@ form:
     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:
-  base: SelfClosingTag
-  attributes:
-    type: Kind of input control to use (checkbox, radio, date, password, text, etc)
-    name: Name of the field. Submitted with the form as part of a name/value pair
-    value: Initial value of the control
-    placeholder: Placeholder text to use for text inputs. If the field is empty, the placeholder is shown.
-    readonly:
-      doc: Include if field is read-only
-      type: bool
-      default: "False"
-    required:
-      doc: Include if field is required
-      type: bool
-      default: "False"
-    formmethod: The HTTP request method to use on click if this input is a submit button. Generally, it is preferred to set the `method` attribute on the `<form>` element instead of this.
-    formaction: The URL to request to on click if this input is a submit button. Generally, it is preferred to set the `action` attribute on the `<form>` element instead of this.
+  skip: true
 
 button:
   base: StylableTag

meta/templates/class_attrs_SelfClosingTag.py

@@ -42,5 +42,5 @@ def __call__(
         }
         return super().__call__(**attributes)
 
-    def _get_default_attributes(self) -> dict[str, Any]:
+    def _get_default_attributes(self, given: dict[str, Any]) -> dict[str, Any]:
         return {default_attrs}

meta/templates/class_attrs_StylableTag.py

@@ -54,5 +54,5 @@ def __call__(
         }
         return super().__call__(*children, **attributes)
 
-    def _get_default_attributes(self) -> dict[str, Any]:
+    def _get_default_attributes(self, given: dict[str, Any]) -> dict[str, Any]:
         return {default_attrs}

meta/templates/class_attrs_Tag.py

@@ -42,5 +42,5 @@ def __call__(
         }
         return super().__call__(*children, **attributes)
 
-    def _get_default_attributes(self) -> dict[str, Any]:
+    def _get_default_attributes(self, given: dict[str, Any]) -> dict[str, Any]:
         return {default_attrs}

pyhtml/__tag_base.py

@@ -56,9 +56,10 @@ def _get_tag_name(self) -> str:
         """
         return type(self).__name__.removesuffix('_')
 
-    def _get_default_attributes(self) -> dict[str, Any]:
+    def _get_default_attributes(self, given: dict[str, Any]) -> dict[str, Any]:
         """
-        Returns the default attributes for the tag
+        Returns the default attributes for the tag given the specified
+        attributes.
 
         This is overridden by child classes to return a dictionary of default
         attributes that are applied to the class.
@@ -71,7 +72,7 @@ def _render(self) -> list[str]:
         a single line of output
         """
         attributes = util.filter_attributes(util.dict_union(
-            self._get_default_attributes(),
+            self._get_default_attributes(self.attributes),
             self.attributes,
         ))
 
@@ -170,7 +171,7 @@ def _render(self) -> list[str]:
         a single line of output
         """
         attributes = util.filter_attributes(util.dict_union(
-            self._get_default_attributes(),
+            self._get_default_attributes(self.attributes),
             self.attributes,
         ))
         if len(attributes):

pyhtml/__tags/__init__.py

@@ -5,11 +5,16 @@
 """
 # Re-export renamed versions of tags
 from .renames import input_, object_
+from .input import input
 
 # Copy this into pyhtml/__tags/__init__.py
 __all__ = [
+    # This one is generated by hand
+    'input',
+    # These two are renamed
     'input_',
     'object_',
+    # These are generated
     'html',
     'base',
     'head',
@@ -225,7 +230,6 @@
     datalist,
     fieldset,
     form,
-    input,
     label,
     legend,
     meter,