misc typing improvements + fix ico path

Author: rmorshea

docs/source/_custom_js/package-lock.json

@@ -5,7 +5,7 @@
 """
 
 from fnmatch import fnmatch
-from typing import Any, Dict, cast
+from typing import Any, cast
 
 from docutils import nodes
 from docutils.nodes import Node
@@ -30,7 +30,6 @@ def get_node_depth(node: Node) -> int:
 
 def register_sections_as_label(app: Sphinx, document: Node) -> None:
     docname = app.env.docname
-    print(docname)
 
     for pattern in app.config.autosectionlabel_skip_docs:
         if fnmatch(docname, pattern):
@@ -67,7 +66,7 @@ def register_sections_as_label(app: Sphinx, document: Node) -> None:
         domain.labels[name] = docname, labelid, sectname
 
 
-def setup(app: Sphinx) -> Dict[str, Any]:
+def setup(app: Sphinx) -> dict[str, Any]:
     app.add_config_value("autosectionlabel_prefix_document", False, "env")
     app.add_config_value("autosectionlabel_maxdepth", None, "env")
     app.add_config_value("autosectionlabel_skip_docs", [], "env")

docs/source/_exts/custom_autosectionlabel.py

@@ -2,7 +2,7 @@
 
 import inspect
 from functools import wraps
-from typing import Any, Callable, Dict, Optional, Tuple
+from typing import Any, Callable, Optional
 
 from .types import ComponentType, VdomDict
 
@@ -41,8 +41,8 @@ def __init__(
         self,
         function: Callable[..., ComponentType | VdomDict | str | None],
         key: Optional[Any],
-        args: Tuple[Any, ...],
-        kwargs: Dict[str, Any],
+        args: tuple[Any, ...],
+        kwargs: dict[str, Any],
         sig: inspect.Signature,
     ) -> None:
         self.key = key

src/client/public/assets/idom-logo-square-small.svg

@@ -8,9 +8,7 @@
     Any,
     Awaitable,
     Callable,
-    Dict,
     Generic,
-    List,
     NewType,
     Optional,
     Sequence,
@@ -625,7 +623,7 @@ def __init__(
         self._rendered_atleast_once = False
         self._current_state_index = 0
         self._state: Tuple[Any, ...] = ()
-        self._event_effects: Dict[EffectType, List[Callable[[], None]]] = {
+        self._event_effects: dict[EffectType, list[Callable[[], None]]] = {
             COMPONENT_DID_RENDER_EFFECT: [],
             LAYOUT_DID_RENDER_EFFECT: [],
             COMPONENT_WILL_UNMOUNT_EFFECT: [],

src/idom/core/component.py

@@ -8,15 +8,11 @@
 from typing import (
     Any,
     Callable,
-    Dict,
     Generic,
     Iterator,
-    List,
     NamedTuple,
     NewType,
     Optional,
-    Set,
-    Tuple,
     TypeVar,
     cast,
 )
@@ -217,7 +213,7 @@ def _render_model_attributes(
         self,
         old_state: Optional[_ModelState],
         new_state: _ModelState,
-        raw_model: Dict[str, Any],
+        raw_model: dict[str, Any],
     ) -> None:
         # extract event handlers from 'eventHandlers' and 'attributes'
         handlers_by_event: EventHandlerDict = raw_model.get("eventHandlers", {})
@@ -385,7 +381,7 @@ def _render_model_children_without_old_state(
         self,
         exit_stack: ExitStack,
         new_state: _ModelState,
-        raw_children: List[Any],
+        raw_children: list[Any],
     ) -> None:
         child_type_key_tuples = list(_process_child_type_and_key(raw_children))
 
@@ -412,7 +408,7 @@ def _render_model_children_without_old_state(
             else:
                 new_state.append_child(child)
 
-    def _unmount_model_states(self, old_states: List[_ModelState]) -> None:
+    def _unmount_model_states(self, old_states: list[_ModelState]) -> None:
         to_unmount = old_states[::-1]  # unmount in reversed order of rendering
         while to_unmount:
             model_state = to_unmount.pop()
@@ -561,8 +557,8 @@ def __init__(
         key: Any,
         model: Ref[VdomJson],
         patch_path: str,
-        children_by_key: Dict[str, _ModelState],
-        targets_by_event: Dict[str, str],
+        children_by_key: dict[str, _ModelState],
+        targets_by_event: dict[str, str],
         life_cycle_state: Optional[_LifeCycleState] = None,
     ):
         self.index = index
@@ -661,7 +657,7 @@ class _ThreadSafeQueue(Generic[_Type]):
     def __init__(self) -> None:
         self._loop = asyncio.get_running_loop()
         self._queue: asyncio.Queue[_Type] = asyncio.Queue()
-        self._pending: Set[_Type] = set()
+        self._pending: set[_Type] = set()
 
     def put(self, value: _Type) -> None:
         if value not in self._pending:
@@ -679,8 +675,8 @@ async def get(self) -> _Type:
 
 
 def _process_child_type_and_key(
-    children: List[Any],
-) -> Iterator[Tuple[Any, _ElementType, Any]]:
+    children: list[Any],
+) -> Iterator[tuple[Any, _ElementType, Any]]:
     for index, child in enumerate(children):
         if isinstance(child, dict):
             child_type = _DICT_TYPE

src/idom/core/hooks.py

@@ -7,10 +7,7 @@
     TYPE_CHECKING,
     Any,
     Callable,
-    Dict,
     Generic,
-    Iterable,
-    List,
     Mapping,
     NamedTuple,
     Optional,
@@ -20,7 +17,7 @@
     Union,
 )
 
-from typing_extensions import Literal, Protocol, TypedDict, runtime_checkable
+from typing_extensions import Literal, Protocol, TypeAlias, TypedDict, runtime_checkable
 
 
 _Type = TypeVar("_Type")
@@ -104,20 +101,13 @@ async def __aexit__(
 VdomChildren = Sequence[VdomChild]
 """Describes a series of :class:`VdomChild` elements"""
 
-VdomAttributesAndChildren = Union[
-    Mapping[str, Any],  # this describes both VdomDict and VdomAttributes
-    Iterable[VdomChild],
-    VdomChild,
-]
-"""Useful for the ``*attributes_and_children`` parameter in :func:`idom.core.vdom.vdom`"""
-
 
 class _VdomDictOptional(TypedDict, total=False):
     key: Key | None
     children: Sequence[
         # recursive types are not allowed yet:
         # https://github.com/python/mypy/issues/731
-        Union[ComponentType, Dict[str, Any], str, Any]
+        Union[ComponentType, dict[str, Any], str, Any]
     ]
     attributes: VdomAttributes
     eventHandlers: EventHandlerDict  # noqa
@@ -142,9 +132,9 @@ class ImportSourceDict(TypedDict):
 class _OptionalVdomJson(TypedDict, total=False):
     key: Key
     error: str
-    children: List[Any]
-    attributes: Dict[str, Any]
-    eventHandlers: Dict[str, _JsonEventTarget]  # noqa
+    children: list[Any]
+    attributes: dict[str, Any]
+    eventHandlers: dict[str, _JsonEventTarget]  # noqa
     importSource: _JsonImportSource  # noqa
 
 
@@ -170,7 +160,7 @@ class _JsonImportSource(TypedDict):
 EventHandlerMapping = Mapping[str, "EventHandlerType"]
 """A generic mapping between event names to their handlers"""
 
-EventHandlerDict = Dict[str, "EventHandlerType"]
+EventHandlerDict: TypeAlias = "dict[str, EventHandlerType]"
 """A dict mapping between event names to their handlers"""
 
 

src/idom/core/layout.py

@@ -20,7 +20,6 @@
     RootComponentConstructor,
     State,
     VdomAttributes,
-    VdomAttributesAndChildren,
     VdomChild,
     VdomChildren,
     VdomDict,
@@ -46,7 +45,6 @@
     "RootComponentConstructor",
     "State",
     "VdomAttributes",
-    "VdomAttributesAndChildren",
     "VdomChild",
     "VdomChildren",
     "VdomDict",