litestar-vite 0.2.0__tar.gz → 0.2.2__tar.gz

{litestar_vite-0.2.0 → litestar_vite-0.2.2}/PKG-INFO

@@ -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 → litestar_vite-0.2.2}/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-0.2.0 → litestar_vite-0.2.2}/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-0.2.0 → litestar_vite-0.2.2}/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-0.2.0 → litestar_vite-0.2.2}/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-0.2.0 → litestar_vite-0.2.2}/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-0.2.0 → litestar_vite-0.2.2}/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 → litestar_vite-0.2.2}/pdm.lock

@@ -5,7 +5,7 @@
 groups = ["default", "dev", "docs", "linting", "nodeenv", "test"]
 strategy = ["inherit_metadata"]
 lock_version = "4.5.0"
-content_hash = "sha256:efdc42d268cebd9ea7f58466a138dc1315193223826403e74692ed057a2488f8"
+content_hash = "sha256:55d55a5e5c3f3a4a552f16d6764c9dfd26ef3ddd3fbff51781236391c936d081"
 
 [[metadata.targets]]
 requires_python = ">=3.8"
@@ -482,14 +482,14 @@ files = [
 
 [[package]]
 name = "exceptiongroup"
-version = "1.2.1"
+version = "1.2.2"
 requires_python = ">=3.7"
 summary = "Backport of PEP 654 (exception groups)"
 groups = ["default", "dev", "test"]
 marker = "python_version < \"3.11\""
 files = [
-    {file = "exceptiongroup-1.2.1-py3-none-any.whl", hash = "sha256:5258b9ed329c5bbdd31a309f53cbfb0b155341807f6ff7606a1e801a891b29ad"},
-    {file = "exceptiongroup-1.2.1.tar.gz", hash = "sha256:a4785e48b045528f5bfe627b6ad554ff32def154f42372786903b7abcfe1aa16"},
+    {file = "exceptiongroup-1.2.2-py3-none-any.whl", hash = "sha256:3111b9d131c238bec2f8f516e123e14ba243563fb135d3fe885990585aa7795b"},
+    {file = "exceptiongroup-1.2.2.tar.gz", hash = "sha256:47c2edf7c6738fafb49fd34290706d1a1a2f4d1c6df275526b62cbb4aa5393cc"},
 ]
 
 [[package]]
@@ -662,13 +662,13 @@ files = [
 
 [[package]]
 name = "identify"
-version = "2.5.36"
+version = "2.6.0"
 requires_python = ">=3.8"
 summary = "File identification library for Python"
 groups = ["linting"]
 files = [
-    {file = "identify-2.5.36-py2.py3-none-any.whl", hash = "sha256:37d93f380f4de590500d9dba7db359d0d3da95ffe7f9de1753faa159e71e7dfa"},
-    {file = "identify-2.5.36.tar.gz", hash = "sha256:e5e00f54165f9047fbebeb4a560f9acfb8af4c88232be60a488e9b68d122745d"},
+    {file = "identify-2.6.0-py2.py3-none-any.whl", hash = "sha256:e79ae4406387a9d300332b5fd366d8994f1525e8414984e1a59e058b2eda2dd0"},
+    {file = "identify-2.6.0.tar.gz", hash = "sha256:cb171c685bdc31bcc4c1734698736a7d5b6c8bf2e0c15117f4d469c8640ae5cf"},
 ]
 
 [[package]]
@@ -1239,7 +1239,7 @@ files = [
 
 [[package]]
 name = "polyfactory"
-version = "2.16.0"
+version = "2.16.2"
 requires_python = "<4.0,>=3.8"
 summary = "Mock data generation factories"
 groups = ["default", "dev"]
@@ -1248,8 +1248,8 @@ dependencies = [
     "typing-extensions>=4.6.0",
 ]
 files = [
-    {file = "polyfactory-2.16.0-py3-none-any.whl", hash = "sha256:168d8e50b77e91e35e691e8b3eedac43d7e423a6857fa26d473def96d53f0ecf"},
-    {file = "polyfactory-2.16.0.tar.gz", hash = "sha256:03d8c706b70c4782ac8e637d0f6ab52760a7d11b712da5936a95a8f7022b2688"},
+    {file = "polyfactory-2.16.2-py3-none-any.whl", hash = "sha256:e5eaf97358fee07d0d8de86a93e81dc56e3be1e1514d145fea6c5f486cda6ea1"},
+    {file = "polyfactory-2.16.2.tar.gz", hash = "sha256:6d0d90deb85e5bb1733ea8744c2d44eea2b31656e11b4fa73832d2e2ab5422da"},
 ]
 
 [[package]]
@@ -1988,7 +1988,7 @@ files = [
 
 [[package]]
 name = "uvicorn"
-version = "0.30.1"
+version = "0.30.3"
 requires_python = ">=3.8"
 summary = "The lightning-fast ASGI server."
 groups = ["dev"]
@@ -1998,13 +1998,13 @@ dependencies = [
     "typing-extensions>=4.0; python_version < \"3.11\"",
 ]
 files = [
-    {file = "uvicorn-0.30.1-py3-none-any.whl", hash = "sha256:cd17daa7f3b9d7a24de3617820e634d0933b69eed8e33a516071174427238c81"},
-    {file = "uvicorn-0.30.1.tar.gz", hash = "sha256:d46cd8e0fd80240baffbcd9ec1012a712938754afcf81bce56c024c1656aece8"},
+    {file = "uvicorn-0.30.3-py3-none-any.whl", hash = "sha256:94a3608da0e530cea8f69683aa4126364ac18e3826b6630d1a65f4638aade503"},
+    {file = "uvicorn-0.30.3.tar.gz", hash = "sha256:0d114d0831ff1adbf231d358cbf42f17333413042552a624ea6a9b4c33dcfd81"},
 ]
 
 [[package]]
 name = "uvicorn"
-version = "0.30.1"
+version = "0.30.3"
 extras = ["standard"]
 requires_python = ">=3.8"
 summary = "The lightning-fast ASGI server."
@@ -2014,14 +2014,14 @@ dependencies = [
     "httptools>=0.5.0",
     "python-dotenv>=0.13",
     "pyyaml>=5.1",
-    "uvicorn==0.30.1",
+    "uvicorn==0.30.3",
     "uvloop!=0.15.0,!=0.15.1,>=0.14.0; (sys_platform != \"cygwin\" and sys_platform != \"win32\") and platform_python_implementation != \"PyPy\"",
     "watchfiles>=0.13",
     "websockets>=10.4",
 ]
 files = [
-    {file = "uvicorn-0.30.1-py3-none-any.whl", hash = "sha256:cd17daa7f3b9d7a24de3617820e634d0933b69eed8e33a516071174427238c81"},
-    {file = "uvicorn-0.30.1.tar.gz", hash = "sha256:d46cd8e0fd80240baffbcd9ec1012a712938754afcf81bce56c024c1656aece8"},
+    {file = "uvicorn-0.30.3-py3-none-any.whl", hash = "sha256:94a3608da0e530cea8f69683aa4126364ac18e3826b6630d1a65f4638aade503"},
+    {file = "uvicorn-0.30.3.tar.gz", hash = "sha256:0d114d0831ff1adbf231d358cbf42f17333413042552a624ea6a9b4c33dcfd81"},
 ]
 
 [[package]]

{litestar_vite-0.2.0 → litestar_vite-0.2.2}/pyproject.toml

@@ -19,14 +19,14 @@ classifiers = [
   "Topic :: Database",
   "Topic :: Database :: Database Engines/Servers",
 ]
-dependencies = ["litestar[jinja]>=2.4.0"]
+dependencies = ["litestar[jinja]>=2.7.0"]
 description = "Vite plugin for Litestar"
 keywords = ["litestar", "vite"]
 license = { text = "MIT" }
 name = "litestar-vite"
 readme = "README.md"
 requires-python = ">=3.8"
-version = "0.2.0"
+version = "0.2.2"
 
 [project.urls]
 Changelog = "https://cofin.github.io/litestar-vite/latest/changelog"