fastlifeweb 0.9.7__py3-none-any.whl → 0.11.0__py3-none-any.whl

fastlife/routing/route.py

@@ -0,0 +1,45 @@
+"""HTTP Route."""
+from typing import TYPE_CHECKING, Any, Callable, Coroutine
+
+from fastapi.routing import APIRoute
+from starlette.requests import Request as StarletteRequest
+from starlette.responses import Response
+
+from fastlife.request.request import Request
+
+if TYPE_CHECKING:
+    from fastlife.config.registry import AppRegistry  # coverage: ignore
+
+
+class Route(APIRoute):
+    """
+    Routing for fastlife application.
+
+    The fastlife router construct fastlife request object in order to
+    have the registry property available in every received request.
+    """
+
+    _registry: "AppRegistry"
+    """
+    The application registry.
+
+    this static variable is initialized by the configurator during
+    the startup and keep the registry during the lifetime of the application.
+
+    this variable should be accessed via the request object or the
+    :class:`fastlife.config.Registry` depenency injection.
+    """
+
+    def get_route_handler(
+        self,
+    ) -> Callable[[StarletteRequest], Coroutine[Any, Any, Response]]:
+        """
+        Replace the request object by the fastlife request associated with the registry.
+        """
+        orig_route_handler = super().get_route_handler()
+
+        async def route_handler(request: StarletteRequest) -> Response:
+            req = Request(self._registry, request)
+            return await orig_route_handler(req)
+
+        return route_handler

fastlife/routing/router.py

@@ -1,13 +1,21 @@
+"""
+FastApi router for fastlife application.
+
+The aim of this router is get :class:`fastlife.routing.route.Route`
+available in the FastApi request depency injection.
+"""
 from typing import Any
 
 from fastapi import APIRouter
 
-from fastlife.configurator.route_handler import FastlifeRoute
+from fastlife.routing.route import Route
 
 
-class FastLifeRouter(APIRouter):
-    """The router used split your app in many routes."""
+class Router(APIRouter):
+    """
+    The router used split your app in many routes.
+    """
 
     def __init__(self, **kwargs: Any) -> None:
-        kwargs["route_class"] = FastlifeRoute
+        kwargs["route_class"] = Route
         super().__init__(**kwargs)

fastlife/security/__init__.py

@@ -0,0 +1 @@
+"""Security features."""

fastlife/security/csrf.py

@@ -1,15 +1,27 @@
 """
-Prevents CSRF attack using cookie and html hidden field comparaison.
+Prevents CSRF attack using cookie and html hidden field comparison.
+
+Fast life did not reinvent the wheel on CSRF Protection.
+
+It use the good old method. A CSRF token is saved in a cookie.
+Forms post the CSRF token, and the token in the cookies and the form must match
+to process the request, otherwise an exception
+:class:`fastlife.security.csrf.CSRFAttack` is raised.
+
+The cookie named is configurabllefia the settings
+:attr:`fastlife.config.settings.Settings.csrf_token_name`
+
+While using the `<Form/>` JinjaX tag, the csrf token is always sent.
+
+The cookie is always set when you render any template. At the moment, there is
+no way to prevent to set the cookie in the request.
 
-Fast life did not reinvent the wheel on CSRF Protection. It use the good old method.
 """
-import secrets
-from typing import TYPE_CHECKING, Any, Callable, Coroutine
 
-from fastapi import Request
+import secrets
+from typing import Any, Callable, Coroutine
 
-if TYPE_CHECKING:
-    from fastlife.configurator.registry import Registry  # coverage: ignore
+from fastlife.request import Request
 
 
 class CSRFAttack(Exception):
@@ -23,12 +35,17 @@ def create_csrf_token() -> str:
     return secrets.token_urlsafe(5)
 
 
-def check_csrf(registry: "Registry") -> Callable[[Request], Coroutine[Any, Any, bool]]:
+def check_csrf() -> Callable[[Request], Coroutine[Any, Any, bool]]:
     """
     A global application dependency, that is always active.
 
-    If you don't want csrf token, its simple don't use the
+    If you don't want csrf token, its simple: don't use the
     application/x-www-form-urlencoded on a POST method.
+
+    For security reason, there it no other options to disable this policy.
+
+    :raises: {class}`.CSRFAttack` if the cookie and the csrf
+        posted in the form does not match.
     """
 
     async def check_csrf(request: Request) -> bool:
@@ -38,13 +55,14 @@ def check_csrf(registry: "Registry") -> Callable[[Request], Coroutine[Any, Any,
             != "application/x-www-form-urlencoded"
         ):
             return True
+        csrf_token_name = request.registry.settings.csrf_token_name
 
-        cookie = request.cookies.get(registry.settings.csrf_token_name)
+        cookie = request.cookies.get(csrf_token_name)
         if not cookie:
             raise CSRFAttack("CSRF token did not match")
 
         form_data = await request.form()
-        value = form_data.get(registry.settings.csrf_token_name)
+        value = form_data.get(csrf_token_name)
         if value != cookie:
             raise CSRFAttack("CSRF token did not match")
 

fastlife/security/policy.py

@@ -9,8 +9,12 @@ def check_permission(permission_name: str) -> CheckPermissionHook:
     """
     A closure that check that a user as the given permission_name.
 
-    This method has to be overriden using the setting check_permission
-    to implement it.
+    This method has to be overriden using the setting
+    :attr:`fastlife.config.settings.Settings.check_permission` to implement it.
+
+    When the check permission is properly set in the settings., the hook is called
+    for every route added with a permission keyword.
+    :meth:`fastlife.config.configurator.Configurator.add_route`
 
     :param permission_name: a permission name set in a view to check access.
     :return: a function that raise http exceptions or any configured exception here.

fastlife/shared_utils/__init__.py

@@ -0,0 +1 @@
+"""Utilities function."""

fastlife/shared_utils/infer.py

@@ -1,3 +1,4 @@
+"""Type inference."""
 from types import UnionType
 from typing import Any, Type, Union, get_origin
 
@@ -5,10 +6,16 @@ from pydantic import BaseModel
 
 
 def is_complex_type(typ: Type[Any]) -> bool:
+    """
+    Used to detect complex type such as Mapping, Sequence and pydantic BaseModel.
+
+    This method cannot be used outside pydantic serialization.
+    """
     return bool(get_origin(typ) or issubclass(typ, BaseModel))
 
 
 def is_union(typ: Type[Any]) -> bool:
+    """Used to detect unions like Optional[T], Union[T, U] or T | U."""
     type_origin = get_origin(typ)
     if type_origin:
         if type_origin is Union:  # Optional[T]

fastlife/shared_utils/resolver.py

@@ -1,6 +1,8 @@
+"""Resolution of python objects for dependency injection and more."""
 import importlib.util
 from pathlib import Path
-from typing import Any, Type, Union
+from types import UnionType
+from typing import Any, Union
 
 
 def resolve(value: str) -> Any:
@@ -24,7 +26,8 @@ def resolve(value: str) -> Any:
     return attr
 
 
-def resolve_extended(value: str) -> Type[Any]:
+def resolve_extended(value: str) -> UnionType:
+    """Resolve many types separed by a pipe (``|``), the union separator."""
     values = value.split("|")
     if len(values) == 1:
         return resolve(value)
@@ -33,6 +36,11 @@ def resolve_extended(value: str) -> Type[Any]:
 
 
 def resolve_path(value: str) -> str:
+    """
+    Resole a path on the disk from a python package name.
+
+    This helper is used to find static assets inside a python package.
+    """
     package_name, resource_name = value.split(":", 1)
     spec = importlib.util.find_spec(package_name)
     if not spec or not spec.origin:

fastlife/templates/A.jinja

@@ -1,14 +1,38 @@
+{# doc
+  Create html ``<a>`` node with htmx support by default.
+  The `hx-get` parameter is set with the href directly unless the
+  `disabled-htmx` attribute has been set.
+#}
 {# def
-href,
-disable_htmx=false,
-hx_target="#maincontent",
-hx_select=None,
-hx_swap="innerHTML show:body:top",
-hx_push_url=true
+  href: Annotated[str, "target link."],
+  id: Annotated[str | None, "unique identifier of the element."] = None,
+  class_: Annotated[
+    str | None,
+    "css class for the node, defaults to :attr:`fastlife.templating.renderer.constants.Constants.A_CLASS`."
+  ] = None,
+  hx_target: Annotated[
+    str,
+    "target the element for swapping than the one issuing the AJAX request."
+  ] = "#maincontent",
+  hx_select: Annotated[str | None, "select the content swapped from response of the AJAX request."] = None,
+  hx_swap: Annotated[
+    str,
+    "specify how the response will be swapped in relative to the target of an AJAX request."
+  ] = "innerHTML show:body:top",
+  hx_push_url: Annotated[bool, "replace the browser url with the link."] = True,
+  disable_htmx: Annotated[bool, "do not add any `hx-*` attibute to the link."] = False
 #}
 
-<a href="{{href}}" {% if not disable_htmx %} hx-get="{{href}}" hx-target="{{hx_target}}" hx-swap="{{hx_swap}}" {% if
-  hx_push_url %} hx-push-url="true" {%- endif %}{% if hx_select %} hx-select="{{hx_select}}" {%- endif %}{%- endif
-  %}class="{{attrs.class or A_CLASS}}">
+<a href="{{href}}"
+  {%- if id %} id="{{ id }}" {%- endif %}
+  {%- if not disable_htmx %}
+    hx-get="{{ href }}"
+    hx-target="{{ hx_target }}"
+    hx-swap="{{ hx_swap }}"
+    {%- if hx_push_url %} hx-push-url="true" {%- endif %}
+    {%- if hx_select %} hx-select="{{ hx_select }}" {%- endif %}
+  {%- endif %}
+    class="{{ attrs.class or A_CLASS }}"
+>
   {{- content -}}
 </a>

fastlife/templates/Button.jinja

@@ -1,35 +1,58 @@
+{# doc
+  Create html ``<button>`` node.
+#}
 {# def
-type="submit",
-id="",
-name="action",
-value="submit",
-hidden=false,
-aria_label="",
-onclick="",
-hx_target="",
-hx_swap="",
-hx_select="",
-hx_after_request="",
-hx_vals="",
-hx_confirm="",
-hx_get="",
-hx_post="",
-hx_put="",
-hx_patch="",
-hx_delete="",
-hx_params=None,
-hx_push_url=false,
-full_width=false,
+  type: Annotated[
+    Literal["submit", "button", "reset"],
+    "Define button behavior."
+  ] = "submit",
+  id: Annotated[str | None, "unique identifier of the element."] = None,
+  class_: Annotated[
+    str | None,
+    "css class for the node, defaults to "
+    ":attr:`fastlife.templating.renderer.constants.Constants.BUTTON_CLASS`."
+  ] = None,
+  name: str = "action",
+  value: str = "submit",
+  hidden: bool = False,
+  aria_label: str | None = None,
+  onclick: str | None = None,
+  hx_target: str | None = None,
+  hx_swap: str | None = None,
+  hx_select: str | None = None,
+  hx_after_request: Annotated[str, "Produce the hx-on::after-request"] = "",
+  hx_vals: str | None = None,
+  hx_confirm: str | None = None,
+  hx_get: str | None = None,
+  hx_post: str | None = None,
+  hx_put: str | None = None,
+  hx_patch: str | None = None,
+  hx_delete: str | None = None,
+  hx_params: str | None = None,
+  hx_push_url: Annotated[bool, "Replace the browser url by the ajax request"] = false,
+  full_width: Annotated[str, "Append tailwind class w-full to get full width"] = false,
 #}
-<button type="{{type}}" {%if id %}id="{{id}}" {%endif%} name="{{name}}" value="{{value}}" {% if
-  hx_target%}hx-target="{{hx_target}}" {% endif %} {% if hx_swap %}hx-swap="{{hx_swap}}" {% endif %} {% if hx_select
-  %}hx-select="{{hx_select}}" {% endif %} {% if onclick %}onclick="{{onclick}}" {% endif %}{% if hx_after_request
-  %}hx-on::after-request="{{hx_after_request}}" {% endif %} {% if hx_vals %}hx-vals='{{hx_vals|safe}}' {% endif %} {% if
-  hx_confirm %}hx-confirm="{{hx_confirm}}" {% endif %} {% if hx_get %}hx-get="{{hx_get}}" {% endif %} {% if hx_post
-  %}hx-post="{{hx_post}}" {% endif %} {% if hx_put %}hx-put="{{hx_put}}" {% endif %}{% if hx_patch
-  %}hx-patch="{{hx_patch}}" {% endif %}{% if hx_delete %}hx-delete="{{hx_delete}}" {% endif %} {% if hx_push_url %}
-  hx-push-url="true" {%- endif %} {% if hx_params %} hx-params="{{hx_params}}" {%- endif %}{% if aria_label
-  %}aria-label="{{aria_label}}" {% endif %} class="{% if full_width %}w-full {% endif %}{{attrs.class or BUTTON_CLASS}}"
-  {% if hidden %}hidden{% endif %}>
-  {{- content -}}
+<button type="{{ type }}"
+  name="{{ name }}"
+  value="{{ value }}"
+  {%- if id %} id="{{ id }}" {%- endif %}
+  {%- if hx_target %} hx-target="{{ hx_target }}" {%- endif %}
+  {%- if hx_swap %} hx-swap="{{ hx_swap }}" {%- endif %}
+  {%- if hx_select %} hx-select="{{ hx_select }}" {%- endif %}
+  {%- if onclick %} onclick="{{ onclick }}" {%- endif %}
+  {%- if hx_after_request %} hx-on::after-request="{{ hx_after_request }}" {%- endif %}
+  {%- if hx_vals %} hx-vals='{{ hx_vals|safe }}' {%- endif %}
+  {%- if hx_confirm %} hx-confirm="{{ hx_confirm }}" {%- endif %}
+  {%- if hx_get %} hx-get="{{ hx_get }}" {%- endif %}
+  {%- if hx_post %} hx-post="{{ hx_post }}" {%- endif %}
+  {%- if hx_put %} hx-put="{{ hx_put }}" {%- endif %}
+  {%- if hx_patch %} hx-patch="{{ hx_patch }}" {%- endif %}
+  {%- if hx_delete %} hx-delete="{{ hx_delete }}" {%- endif %}
+  {%- if hx_push_url %} hx-push-url="true" {%- endif %}
+  {%- if hx_params %} hx-params="{{ hx_params }}" {%- endif %}
+  {%- if aria_label %} aria-label="{{ aria_label }}" {%- endif %}
+  class="{% if full_width %}w-full {% endif %}{{ attrs.class or BUTTON_CLASS }}"
+  {%- if hidden %} hidden{% endif -%}
+>
+    {{- content -}}
 </button>

fastlife/templates/Checkbox.jinja

@@ -1,8 +1,22 @@
+{# doc
+  Create html ``<input type="checkbox" />`` node.
+#}
 {# def
-name,
-id,
-value=None,
-checked=False,
+  name: Annotated[str, "Name of the checkbox"],
+  id: Annotated[str | None, "unique identifier of the element."] = None,
+  class_: Annotated[
+    str | None,
+    "css class for the node, defaults to "
+    ":attr:`fastlife.templating.renderer.constants.Constants.CHECKBOX_CLASS`."
+  ] = None,
+  value: Annotated[str | None, "http submitted value if the checkbox is checked"] = None,
+  checked: Annotated[bool, "Initialized the checkbox as ticked"] = False,
 #}
-<input name="{{name}}" {% if value is not none %}value="{{value}}" {% endif %} {% if checked %}checked{% endif %}
-  type="checkbox" id="{{id}}" class="{{attrs.class or CHECKBOX_CLASS}}" />
+<input
+  name="{{ name }}"
+  type="checkbox"
+  {%- if id %} id="{{id}}" {%- endif %}
+  {%- if value is not none %} value="{{ value }}" {%- endif %}
+  class="{{ attrs.class or CHECKBOX_CLASS }}"
+  {%- if checked %} checked{% endif -%}
+/>

fastlife/templates/CsrfToken.jinja

@@ -1 +1,5 @@
+{# doc
+  a :jinjax:component:`Hidden` field automaticaly injected in every
+  :jinjax:component:`Form` to protect against CSRF Attacks.
+#}
 <Hidden :name="csrf_token.name" :value="csrf_token.value" />

fastlife/templates/Details.jinja

@@ -1,4 +1,32 @@
-{# def id=None, open=True #}
-<details{% if id%} id="{{id}}"{% endif%} class="{{attrs.class or DETAILS_CLASS}}" {% if open %}open{% endif %}>
-  {{content}}
+{# doc
+
+  Produce a ``<details>`` html node in order to create a collapsible box.
+
+  .. code-block:: html
+
+    <Details>
+      <Summary :id="my-summary">
+        <H3 :class="H3_SUMMARY_CLASS">A title</H3>
+      </Summary>
+      <div>
+        Some content
+      </div>
+    </Details>
+
+#}
+{# def
+  id: Annotated[str | None, "unique identifier of the element."] = None,
+  class_: Annotated[
+    str | None,
+    "css class for the node, defaults to "
+    ":attr:`fastlife.templating.renderer.constants.Constants.DETAILS_CLASS`."
+  ] = None,
+  open: Annotated[bool, "open/close state."] = True,
+#}
+<details
+  {%- if id %} id="{{id}}" {% endif %}
+  class="{{attrs.class or DETAILS_CLASS}}"
+  {%- if open %} open {%- endif -%}
+>
+  {{- content -}}
 </details>

fastlife/templates/Form.jinja

@@ -1,11 +1,49 @@
+{# doc
+  Create html ``<form>`` node with htmx support by default.
+  A :jinjax:component:`CsrfToken` will always be included in the form
+  and will be checked by the
+  :func:`csrf policy method <fastlife.security.csrf.check_csrf>`.
+
+  ::
+
+    <Form :hx-post="true">
+      <Input name="name" placeholder="Bob" />
+      <Button>Submit</Button>
+    </Form>
+
+#}
+
 {# def
-method="",
-action=None,
-hx_post=None,
+  id: Annotated[str | None, "unique identifier of the element."] = None,
+  class_: Annotated[
+    str | None,
+    "css class for the node, defaults to "
+    ":attr:`fastlife.templating.renderer.constants.Constants.FORM_CLASS`"
+  ] = None,
+  method: Annotated[Literal["get", "post"] | None, "Http method used"] = None,
+  action: Annotated[str | None, "url where the form will be submitted"] = None,
+  hx_post: Annotated[
+    str | Literal[True] | None,
+    "url where the form will be submitted using htmx. if ``True``, the current url is used."\
+  ] = None,
+  hx_disable: Annotated[
+    Literal[True] | None,
+    "if true, then htmx will be disabled for the form and for all its children nodes."
+  ] = None,
 #}
-<form class="{{attrs.class or FORM_CLASS}}" {% if hx_post is not none
-  %}hx-post="{% if hx_post is not true %}{{hx_post}}{% endif%}" {% endif %}{% if action is not none
-  %}action="{{action}}" {% endif %}{% if method %}method="{{method}}" {% endif %}>
+<form
+    {%- if id %} id="{{id}}" {% endif %}
+    class="{{attrs.class or FORM_CLASS}}"
+    {%- if hx_disable %}
+      hx-disable
+    {%- else %}
+      {%- if hx_post is not none %}
+        hx-post="{% if hx_post is not true %}{{hx_post}}{% endif %}"
+      {%- endif %}
+    {%- endif %}
+    {%- if action is not none %} action="{{action}}" {%- endif %}
+    {%- if method %} method="{{method}}" {%- endif -%}
+>
   <CsrfToken />
-  {{ content }}
+  {{- content -}}
 </form>

fastlife/templates/H1.jinja

@@ -1 +1,14 @@
-<h1 class="{{attrs.class or H1_CLASS}}">{{ content }}</h1>
+{# doc html ``<h1>`` node. #}
+{# def
+  id: Annotated[str | None, "unique identifier of the element."] = None,
+  class_: Annotated[
+    str | None,
+    "css class for the node, defaults to "
+    ":attr:`fastlife.templating.renderer.constants.Constants.H1_CLASS`."
+  ] = None,
+#}
+<h1
+  {%- if id %} id="{{id}}" {%- endif %}
+  class="{{attrs.class or H1_CLASS}}">
+  {{- content -}}
+</h1>

fastlife/templates/H2.jinja

@@ -1 +1,14 @@
-<h2 class="{{attrs.class or H2_CLASS}}">{{ content }}</h2>
+{# doc html ``<h2>`` node. #}
+{# def
+  id: Annotated[str | None, "unique identifier of the element."] = None,
+  class_: Annotated[
+    str | None,
+    "css class for the node, defaults to "
+    ":attr:`fastlife.templating.renderer.constants.Constants.H2_CLASS`."
+  ] = None,
+#}
+<h2
+  {%- if id %} id="{{id}}" {%- endif %}
+  class="{{attrs.class or H2_CLASS}}">
+  {{- content -}}
+</h2>

fastlife/templates/H3.jinja

@@ -1 +1,14 @@
-<h3 class="{{attrs.class or H3_CLASS}}">{{ content }}</h3>
+{# doc html ``<h3>`` node. #}
+{# def
+  id: Annotated[str | None, "unique identifier of the element."] = None,
+  class_: Annotated[
+    str | None,
+    "css class for the node, defaults to "
+    ":attr:`fastlife.templating.renderer.constants.Constants.H3_CLASS`."
+  ] = None,
+#}
+<h3
+  {%- if id %} id="{{id}}" {%- endif %}
+  class="{{attrs.class or H3_CLASS}}">
+  {{- content -}}
+</h3>

fastlife/templates/H4.jinja

@@ -1 +1,14 @@
-<h4 class="{{attrs.class or H4_CLASS}}">{{ content }}</h4>
+{# doc html ``<h4>`` node. #}
+{# def
+  id: Annotated[str | None, "unique identifier of the element."] = None,
+  class_: Annotated[
+    str | None,
+    "css class for the node, defaults to "
+    ":attr:`fastlife.templating.renderer.constants.Constants.H4_CLASS`."
+  ] = None,
+#}
+<h4
+  {%- if id %} id="{{id}}" {%- endif %}
+  class="{{attrs.class or H4_CLASS}}">
+  {{- content -}}
+</h4>

fastlife/templates/H5.jinja

@@ -1 +1,14 @@
-<h5 class="{{attrs.class or H5_CLASS}}">{{ content }}</h5>
+{# doc html ``<h5>`` node. #}
+{# def
+  id: Annotated[str | None, "unique identifier of the element."] = None,
+  class_: Annotated[
+    str | None,
+    "css class for the node, defaults to "
+    ":attr:`fastlife.templating.renderer.constants.Constants.H5_CLASS`."
+  ] = None,
+#}
+<h5
+  {%- if id %} id="{{id}}" {%- endif %}
+  class="{{attrs.class or H5_CLASS}}">
+  {{- content -}}
+</h5>

fastlife/templates/H6.jinja

@@ -1 +1,14 @@
-<h6 class="{{attrs.class or H6_CLASS}}">{{ content }}</h6>
+{# doc html ``<h6>`` node. #}
+{# def
+  id: Annotated[str | None, "unique identifier of the element."] = None,
+  class_: Annotated[
+    str | None,
+    "css class for the node, defaults to "
+    ":attr:`fastlife.templating.renderer.constants.Constants.H6_CLASS`."
+  ] = None,
+#}
+<h6
+  {%- if id %} id="{{id}}" {%- endif %}
+  class="{{attrs.class or H6_CLASS}}">
+  {{- content -}}
+</h6>

fastlife/templates/Hidden.jinja

@@ -1,6 +1,6 @@
 {# def
-name,
-value,
-id="",
+  name: Annotated[str, "submitted name in the form"],
+  value: Annotated[str, "submitted value in the form"],
+  id: Annotated[str | None, "unique identifier of the element."] = None,
 #}
 <input name="{{name}}" value="{{value}}" type="hidden" {%if id %}id="{{id}}" {%endif%} />

fastlife/templates/Input.jinja

@@ -1,12 +1,25 @@
+{# doc
+  Produce ``<input>`` node.
+#}
 {# def
-name,
-value="",
-type="text",
-id="",
-aria_label="",
-placeholder="",
+  name: Annotated[str, "submitted name in the form"],
+  value: Annotated[str, "submitted value in the form"] = "",
+  type: Annotated[str, "type of the control"] = "text",
+  id: Annotated[str | None, "unique identifier of the element."] = None,
+  class_: Annotated[
+    str | None,
+    "css class for the node, defaults to "
+    ":attr:`fastlife.templating.renderer.constants.Constants.INPUT_CLASS`."
+  ] = None,
+  aria_label: Annotated[str | None, "aria-label"] = None,
+  placeholder: Annotated[
+    str | None,
+    "brief hint to the user as to what kind of information is expected in the field."
+  ] = None,
 #}
 
-<input name="{{name}}" value="{{value}}" type="{{type}}" {% if id %}id="{{id}}" {% endif %}{% if aria_label
-  %}aria-label="{{aria_label}}" {% endif %} {% if placeholder %}placeholder="{{placeholder}}" {% endif %}
+<input name="{{name}}" value="{{value}}" type="{{type}}"
+  {%- if id %} id="{{id}}" {%- endif %}
+  {%- if aria_label %} aria-label="{{aria_label}}" {%- endif %}
+  {%- if placeholder %} placeholder="{{placeholder}}" {%- endif %}
   class="{{attrs.class or INPUT_CLASS}}" />