inline prefix settings check

Author: joshuadavidthomas

src/django_bird/conf.py

@@ -17,9 +17,9 @@
 
 @dataclass
 class AppSettings:
+    ADD_ASSET_PREFIX: bool | None = None
     COMPONENT_DIRS: list[Path | str] = field(default_factory=list)
     ENABLE_BIRD_ATTRS: bool = True
-    ADD_ASSET_PREFIX: bool | None = None
 
     @override
     def __getattribute__(self, __name: str) -> object:
@@ -29,13 +29,5 @@ def __getattribute__(self, __name: str) -> object:
     def get_component_directory_names(self):
         return unique_ordered([*self.COMPONENT_DIRS, "bird"])
 
-    def should_add_asset_prefix(self) -> bool:
-        """Determine if the app label prefix should be added to asset URLs."""
-        if self.ADD_ASSET_PREFIX is not None:
-            return self.ADD_ASSET_PREFIX
-
-        # Fall back to the DEBUG setting (add prefix in production)
-        return not settings.DEBUG
-
 
 app_settings = AppSettings()

src/django_bird/staticfiles.py

@@ -12,6 +12,7 @@
 from typing import final
 from typing import overload
 
+from django.conf import settings
 from django.contrib.staticfiles import finders
 from django.contrib.staticfiles.finders import BaseFinder
 from django.contrib.staticfiles.storage import StaticFilesStorage
@@ -178,16 +179,16 @@ def __init__(self, *args: Any, prefix: str, **kwargs: Any):
     def url(self, name: str | None) -> str:
         if name is None:
             return super().url(name)
-        # Determine if we should add the prefix based on the app settings
-        from .conf import app_settings
-
         # Add prefix based on app settings configuration
         # In development, asset paths don't include the app label prefix
         # because they come directly from source directories
         # In production, assets are collected to STATIC_ROOT/django_bird/
-        if app_settings.should_add_asset_prefix() and not name.startswith(
-            f"{self.prefix}/"
-        ):
+        add_prefix = (
+            app_settings.ADD_ASSET_PREFIX
+            if app_settings.ADD_ASSET_PREFIX is not None
+            else not settings.DEBUG
+        )
+        if add_prefix and not name.startswith(f"{self.prefix}/"):
             name = f"{self.prefix}/{name}"
         return super().url(name)