litestar-vite 0.2.0__py3-none-any.whl → 0.2.2__py3-none-any.whl

litestar_vite/config.py

@@ -17,6 +17,7 @@ if TYPE_CHECKING:
 
 __all__ = ("ViteConfig", "ViteTemplateConfig")
 EngineType = TypeVar("EngineType", bound=TemplateEngineProtocol[Any, Any])
+TRUE_VALUES = {"True", "true", "1", "yes", "Y", "T"}
 
 
 @dataclass
@@ -53,7 +54,7 @@ class ViteConfig:
     This file contains a single line containing the host, protocol, and port the Vite server is running.
     """
     hot_reload: bool = field(
-        default_factory=lambda: os.getenv("VITE_HOT_RELOAD", "True") in {"True", "1", "yes", "Y", "T"},
+        default_factory=lambda: os.getenv("VITE_HOT_RELOAD", "True") in TRUE_VALUES,
     )
     """Enable HMR for Vite development server."""
     ssr_enabled: bool = False
@@ -88,11 +89,11 @@ class ViteConfig:
     install_command: list[str] = field(default_factory=lambda: ["npm", "install"])
     """Default command to use for installing Vite."""
     use_server_lifespan: bool = field(
-        default_factory=lambda: os.getenv("VITE_USE_SERVER_LIFESPAN", "False") in {"True", "1", "yes", "Y", "T"},
+        default_factory=lambda: os.getenv("VITE_USE_SERVER_LIFESPAN", "False") in TRUE_VALUES,
     )
     """Utilize the server lifespan hook to run Vite."""
     dev_mode: bool = field(
-        default_factory=lambda: os.getenv("VITE_DEV_MODE", "False") in {"True", "1", "yes", "Y", "T"},
+        default_factory=lambda: os.getenv("VITE_DEV_MODE", "False") in TRUE_VALUES,
     )
     """When True, Vite will run with HMR or watch build"""
     detect_nodeenv: bool = True

litestar_vite/inertia/_utils.py

@@ -15,6 +15,7 @@ class InertiaHeaders(str, Enum):
     PARTIAL_DATA = "X-Inertia-Partial-Data"
     PARTIAL_COMPONENT = "X-Inertia-Partial-Component"
     LOCATION = "X-Inertia-Location"
+    REFERER = "Referer"
 
 
 def get_enabled_header(enabled: bool = True) -> dict[str, Any]:

litestar_vite/inertia/exception_handler.py

@@ -1,3 +1,4 @@
+import contextlib
 import re
 from typing import TYPE_CHECKING, Any, cast
 
@@ -7,6 +8,7 @@ from litestar.connection.base import AuthT, StateT, UserT
 from litestar.exceptions import (
     HTTPException,
     InternalServerException,
+    NotAuthorizedException,
     NotFoundException,
     PermissionDeniedException,
 )
@@ -42,7 +44,7 @@ class _HTTPConflictException(HTTPException):
     status_code = HTTP_409_CONFLICT
 
 
-def exception_to_http_response(request: Request[UserT, AuthT, StateT], exc: Exception) -> Response[Any]:
+def exception_to_http_response(request: Request[UserT, AuthT, StateT], exc: Exception) -> Response[Any]:  # noqa: PLR0911
     """Handler for all exceptions subclassed from HTTPException."""
     inertia_enabled = getattr(request, "inertia_enabled", False) or getattr(request, "is_inertia", False)
     if isinstance(exc, NotFoundError):
@@ -64,7 +66,8 @@ def exception_to_http_response(request: Request[UserT, AuthT, StateT], exc: Exce
     inertia_plugin = cast("InertiaPlugin", request.app.plugins.get("InertiaPlugin"))
     if extras:
         content.update({"extra": extras})
-    flash(request, detail, category="error")
+    with contextlib.suppress(Exception):
+        flash(request, detail, category="error")
     if extras and len(extras) >= 1:
         message = extras[0]
         default_field = f"root.{message.get('key')}" if message.get("key", None) is not None else "root"  # type: ignore
@@ -72,18 +75,23 @@ def exception_to_http_response(request: Request[UserT, AuthT, StateT], exc: Exce
         match = FIELD_ERR_RE.search(error_detail)
         field = match.group(1) if match else default_field
         if isinstance(message, dict):
-            error(request, field, error_detail)
-    if status_code in {HTTP_422_UNPROCESSABLE_ENTITY, HTTP_400_BAD_REQUEST}:
-        return InertiaBack(request)
-    if (
-        status_code == HTTP_401_UNAUTHORIZED
-        and inertia_plugin.config.redirect_unauthorized_to is not None
-        and not request.url.path.startswith(inertia_plugin.config.redirect_unauthorized_to)
+            with contextlib.suppress(Exception):
+                error(request, field, error_detail)
+    if status_code in {HTTP_422_UNPROCESSABLE_ENTITY, HTTP_400_BAD_REQUEST} or isinstance(
+        exc,
+        PermissionDeniedException,
     ):
-        return InertiaRedirect(
-            request,
-            redirect_to=inertia_plugin.config.redirect_unauthorized_to,
+        return InertiaBack(request)
+    if isinstance(exc, PermissionDeniedException):
+        return InertiaBack(request)
+    if status_code == HTTP_401_UNAUTHORIZED or isinstance(exc, NotAuthorizedException):
+        redirect_to = (
+            inertia_plugin.config.redirect_unauthorized_to is not None
+            and str(request.url) != inertia_plugin.config.redirect_unauthorized_to
         )
+        if redirect_to:
+            return InertiaRedirect(request, redirect_to=cast("str", inertia_plugin.config.redirect_unauthorized_to))
+        return InertiaBack(request)
     return InertiaResponse[Any](
         media_type=preferred_type,
         content=content,

litestar_vite/inertia/middleware.py

@@ -15,7 +15,7 @@ if TYPE_CHECKING:
         StateT,
         UserT,
     )
-    from litestar.types import ASGIApp
+    from litestar.types import ASGIApp, Receive, Scope, Send
 
 
 async def redirect_on_asset_version_mismatch(request: Request[UserT, AuthT, StateT]) -> InertiaRedirect | None:
@@ -32,10 +32,6 @@ async def redirect_on_asset_version_mismatch(request: Request[UserT, AuthT, Stat
     return InertiaRedirect(request, redirect_to=str(request.url))
 
 
-if TYPE_CHECKING:
-    from litestar.types import Receive, Scope, Send
-
-
 class InertiaMiddleware(AbstractMiddleware):
     def __init__(self, app: ASGIApp) -> None:
         super().__init__(app)

litestar_vite/inertia/request.py

@@ -69,6 +69,11 @@ class InertiaDetails:
         """Partial Data Reload."""
         return self._get_header_value(InertiaHeaders.PARTIAL_DATA)
 
+    @cached_property
+    def referer(self) -> str | None:
+        """Partial Data Reload."""
+        return self._get_header_value(InertiaHeaders.REFERER)
+
     @cached_property
     def is_partial_render(self) -> bool:
         """Is Partial Data Reload."""

litestar_vite/inertia/response.py

@@ -6,7 +6,7 @@ from functools import lru_cache
 from mimetypes import guess_type
 from pathlib import PurePath
 from textwrap import dedent
-from typing import TYPE_CHECKING, Any, Dict, Iterable, Mapping, TypeVar, cast
+from typing import TYPE_CHECKING, Any, Dict, Iterable, List, Mapping, TypeVar, cast
 from urllib.parse import quote
 
 from litestar import Litestar, MediaType, Request, Response
@@ -16,6 +16,7 @@ from litestar.response import Redirect
 from litestar.response.base import ASGIResponse
 from litestar.serialization import get_serializer
 from litestar.status_codes import HTTP_200_OK, HTTP_303_SEE_OTHER, HTTP_307_TEMPORARY_REDIRECT, HTTP_409_CONFLICT
+from litestar.types import Empty
 from litestar.utils.deprecation import warn_deprecation
 from litestar.utils.empty import value_or_default
 from litestar.utils.helpers import get_enum_string_value
@@ -33,6 +34,7 @@ if TYPE_CHECKING:
     from litestar.connection.base import AuthT, StateT, UserT
     from litestar.types import ResponseCookies, ResponseHeaders, TypeEncodersMap
 
+    from litestar_vite.inertia.request import InertiaRequest
     from litestar_vite.inertia.routes import Routes
 
     from .plugin import InertiaPlugin
@@ -63,10 +65,11 @@ def get_shared_props(request: ASGIConnection[Any, Any, Any, Any]) -> Dict[str, A
     Be sure to call this before `self.create_template_context` if you would like to include the `flash` message details.
     """
     error_bag = request.headers.get("X-Inertia-Error-Bag", None)
-    errors = request.session.pop("_errors", {})
-    props = request.session.pop("_shared", {})
+    has_active_session = not (not request.session or request.scope["session"] is Empty)
+    errors: dict[str, Any] = request.session.pop("_errors", {}) if has_active_session else {}
+    props: dict[str, Any] = request.session.pop("_shared", {}) if has_active_session else {}
     flash: dict[str, list[str]] = defaultdict(list)
-    for message in request.session.pop("_messages", []):
+    for message in cast("List[Dict[str,Any]]", request.session.pop("_messages", []) if has_active_session else []):
         flash[message["category"]].append(message["message"])
 
     inertia_plugin = cast("InertiaPlugin", request.app.plugins.get("InertiaPlugin"))
@@ -337,8 +340,12 @@ class InertiaBack(Redirect):
         """Initialize external redirect, Set status code to 409 (required by Inertia),
         and pass redirect url.
         """
+        referer = request.headers.get("referer", str(request.base_url))
+        inertia_enabled = getattr(request, "inertia_enabled", False) or getattr(request, "is_inertia", False)
+        if inertia_enabled:
+            referer = cast("InertiaRequest[Any, Any, Any]", request).inertia.referer or referer
         super().__init__(
-            path=request.headers["Referer"],
+            path=request.headers.get("referer", str(request.base_url)),
             status_code=HTTP_307_TEMPORARY_REDIRECT if request.method == "GET" else HTTP_303_SEE_OTHER,
             cookies=request.cookies,
             **kwargs,

{litestar_vite-0.2.0.dist-info → litestar_vite-0.2.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: litestar-vite
-Version: 0.2.0
+Version: 0.2.2
 Summary: Vite plugin for Litestar
 Project-URL: Changelog, https://cofin.github.io/litestar-vite/latest/changelog
 Project-URL: Discord, https://discord.gg/X3FJqy8d2j
@@ -30,7 +30,7 @@ Classifier: Topic :: Database :: Database Engines/Servers
 Classifier: Topic :: Software Development
 Classifier: Typing :: Typed
 Requires-Python: >=3.8
-Requires-Dist: litestar[jinja]>=2.4.0
+Requires-Dist: litestar[jinja]>=2.7.0
 Provides-Extra: nodeenv
 Requires-Dist: nodeenv; extra == 'nodeenv'
 Description-Content-Type: text/markdown

{litestar_vite-0.2.0.dist-info → litestar_vite-0.2.2.dist-info}/RECORD

@@ -2,19 +2,19 @@ litestar_vite/__init__.py,sha256=QEZzbM6LXuSm52rzpzcw3OihR7xxoPCZ6jhWtZH2dZc,402
 litestar_vite/__metadata__.py,sha256=Eml1c9xezV-GSodmysksrT8jPWqE__x0ENO1wM5g6q0,319
 litestar_vite/cli.py,sha256=foXJ-xW1bvUEsT7nPo1hbN0FLaDzHWPG4zpmqN__rY0,10976
 litestar_vite/commands.py,sha256=sfTdFfMcDxnW3_tbmIIBjpHmNdQYKHjSguGxXNP8SVw,4440
-litestar_vite/config.py,sha256=Mg86uVtqDG-uVZd2YUZoJYNRIlBBbyJLl8iI-fO1zKo,7527
+litestar_vite/config.py,sha256=J5U0hBa_cD7lm15lg24QqMy3hsZ_1QIIETxwaNZIm84,7523
 litestar_vite/loader.py,sha256=USrzNDppXgXLvW5WCuIgKPuM6MlECNIssnkwb_p-E8s,8117
 litestar_vite/plugin.py,sha256=2rwlumH3CFozb_7NGOFwn20BMZ_4JTNHiWh0oyaN-gc,5131
 litestar_vite/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 litestar_vite/template_engine.py,sha256=ffC4KPtUUNkuC0tJ0bD1Bu7c8lE33vKP0US1fWUYnO8,3853
 litestar_vite/inertia/__init__.py,sha256=PMOon8tag-20riAkHH3U4VLk7NBwt9lHsOHHSKMQHJQ,695
-litestar_vite/inertia/_utils.py,sha256=IAsK4Nrjx2dr9z7rXBLHAu_FG8GvCpo_fpywY7RHwl0,1932
+litestar_vite/inertia/_utils.py,sha256=ijO9Lgka7ZPIAHkby9szbTGoSg0nDShC2bqWT9cDxi0,1956
 litestar_vite/inertia/config.py,sha256=6cYR4m5oGsJnL_rH6Dt8bQJ804Oq6knj6qDsCVUqNsI,942
-litestar_vite/inertia/exception_handler.py,sha256=fXLfUtrooAORd7TWJGx8hDd6_0h_mI3w89CqJz5IMmE,4022
-litestar_vite/inertia/middleware.py,sha256=9ADCoCNdQNLDYhQ6ctY4Lo92E_EtgBPqIo2SdOJz9zU,1766
+litestar_vite/inertia/exception_handler.py,sha256=yTgyd5BkOyTvg8HKWgQEzJuOIBnd4uv7LkCBee_pEPw,4433
+litestar_vite/inertia/middleware.py,sha256=NEDcAoT7GMWA9hEGvANZ3MG5_p3MmZX57RF95T71les,1716
 litestar_vite/inertia/plugin.py,sha256=ebAG9XnDBahttuc7WIUgBd3o_Ys8MdPS273LPNs5H8A,2344
-litestar_vite/inertia/request.py,sha256=UReg7_ks6MGa2HbIpDsD2DochckbLA-c-k8Er2mHkVA,3509
-litestar_vite/inertia/response.py,sha256=31Hm838c7nJAkKe9joLj-c33UlZpWTFAgQefxLd5vn0,14379
+litestar_vite/inertia/request.py,sha256=hk8m1pmDiMbWhVurRDHfDPD24nMHp56JzUKV6SBDeqA,3665
+litestar_vite/inertia/response.py,sha256=vvpvz-yNTyboIa2dzVMhaMrCxzDTgyM2U_nGEwbN3Po,15051
 litestar_vite/inertia/routes.py,sha256=QksJm2RUfL-WbuhOieYnPXXWO5GYnPtmsYEm6Ef8Yeo,1782
 litestar_vite/inertia/types.py,sha256=tLp0pm1N__hcWC875khf6wH1nuFlKS9-VjDqgsRkXnw,702
 litestar_vite/templates/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -24,7 +24,7 @@ litestar_vite/templates/package.json.j2,sha256=0JWgdTuaSZ25EmCltF_zbqDdpxfvCLeYu
 litestar_vite/templates/styles.css.j2,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 litestar_vite/templates/tsconfig.json.j2,sha256=q1REIuVyXUHCy4Zi2kgTkmrhdT98vyY89k-WTrImOj8,843
 litestar_vite/templates/vite.config.ts.j2,sha256=FZ4OJaB8Kjby_nlx4_LCP8eCe1LRi8kW2GspCiVMfDY,1115
-litestar_vite-0.2.0.dist-info/METADATA,sha256=DGPtfcXb9Khk4EXmvwXCJAb2T992hzHkR3CLtIHAqG8,6180
-litestar_vite-0.2.0.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-litestar_vite-0.2.0.dist-info/licenses/LICENSE,sha256=HeTiEfEgvroUXZe_xAmYHxtTBgw--mbXyZLsWDYabHc,1069
-litestar_vite-0.2.0.dist-info/RECORD,,
+litestar_vite-0.2.2.dist-info/METADATA,sha256=ue7XPxpNkXIidXS7TKrqzeYEMwDjKexrjLHFnxodwO4,6180
+litestar_vite-0.2.2.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+litestar_vite-0.2.2.dist-info/licenses/LICENSE,sha256=HeTiEfEgvroUXZe_xAmYHxtTBgw--mbXyZLsWDYabHc,1069
+litestar_vite-0.2.2.dist-info/RECORD,,