Additional typing fixes

src/coaster/sqlalchemy/markdown.py

@@ -81,7 +81,7 @@ def text(self, value: Optional[str]) -> None:
         )
         self.changed()
 
-    def __json__(self) -> dict[str, Optional[str]]:
+    def __json__(self) -> Any:
         """Return JSON-compatible rendering of composite."""
         return {'text': self._text, 'html': self._html}
 

src/coaster/sqlalchemy/roles.py

@@ -1049,7 +1049,7 @@ def __setitem__(self, key: str, value: str) -> None:
     def __iter__(self) -> Iterator[str]:
         yield from self._all_read
 
-    def __json__(self) -> dict[str, Any]:
+    def __json__(self) -> Any:
         if self._datasets is None and self._obj.__json_datasets__:
             # This proxy was created without specifying datasets, so we create a new
             # proxy using the object's default JSON datasets, then convert it to a dict

src/coaster/views/decorators.py

@@ -9,7 +9,7 @@
 
 from __future__ import annotations
 
-from collections.abc import Collection, Container, Iterable
+from collections.abc import Collection, Container, Iterable, Mapping
 from functools import wraps
 from typing import TYPE_CHECKING, Any, Callable, Literal, Optional, TypeVar, Union, cast
 from typing_extensions import ParamSpec
@@ -50,7 +50,7 @@
     'requires_permission',
 ]
 
-ReturnRenderWithData = dict[str, Any]
+ReturnRenderWithData = Mapping[str, Any]
 ReturnRenderWithResponse = Union[WerkzeugResponse, ReturnRenderWithData]
 ReturnRenderWithHeaders = Union[list[tuple[str, str]], dict[str, str], Headers]
 ReturnRenderWith = Union[

tests/coaster_tests/views_classview_test.py

@@ -349,12 +349,12 @@ def before_request(
 
     @route('perm')
     @requires_permission('edit')
-    def by_perm(self):
+    def by_perm(self) -> str:
         return 'perm-called'
 
     @route('role')
     @requires_roles({'owner'})
-    def by_role(self):
+    def by_role(self) -> str:
         return 'role-called'
 
     @route('perm-role')

tests/coaster_tests/views_renderwith_test.py

@@ -1,4 +1,5 @@
 import unittest
+from collections.abc import Mapping
 from typing import Any
 
 import pytest
@@ -13,7 +14,7 @@
 app = Flask(__name__)
 
 
-def viewcallable(data: dict[str, Any]) -> BaseResponse:
+def viewcallable(data: Mapping[str, Any]) -> BaseResponse:
     return Response(repr(data), mimetype='text/plain')