Merge pull request #15 from ar90n/feature/simplify-type-hints

chore: Simplify type hints

alfort/app.py

@@ -1,7 +1,7 @@
 from abc import abstractmethod
 from dataclasses import dataclass, replace
 from itertools import zip_longest
-from typing import Callable, Generic, List, Optional, Tuple, TypeAlias, TypeVar, Union
+from typing import Callable, Generic, TypeAlias, TypeVar
 
 from alfort.vdom import (
     Element,
@@ -23,9 +23,9 @@
 
 Dispatch: TypeAlias = Callable[[M], None]
 Effect: TypeAlias = Callable[[Dispatch[M]], None]
-View: TypeAlias = Callable[[S], Optional[VDom]]
-Update: TypeAlias = Callable[[M, S], Tuple[S, List[Effect[M]]]]
-Init: TypeAlias = Callable[[], Tuple[S, List[Effect[M]]]]
+View: TypeAlias = Callable[[S], VDom | None]
+Update: TypeAlias = Callable[[M, S], tuple[S, list[Effect[M]]]]
+Init: TypeAlias = Callable[[], tuple[S, list[Effect[M]]]]
 Mount: TypeAlias = Callable[[N], None]
 
 
@@ -40,7 +40,7 @@ class NodeDomText:
     node: Node
 
 
-NodeDom = Union[NodeDomElement, NodeDomText]
+NodeDom = NodeDomElement | NodeDomText
 
 
 class Alfort(Generic[S, M, N]):

alfort/vdom.py

@@ -1,21 +1,12 @@
 from dataclasses import dataclass
-from typing import (
-    Any,
-    Generic,
-    List,
-    MutableMapping,
-    Protocol,
-    TypeAlias,
-    TypeVar,
-    Union,
-)
+from typing import Any, Generic, MutableMapping, Protocol, TypeAlias, TypeVar
 
 T = TypeVar("T")
 
 
 @dataclass(slots=True, frozen=True)
 class PatchProps:
-    remove_keys: List[str]
+    remove_keys: list[str]
     add_props: "Props"
 
 
@@ -35,7 +26,7 @@ class PatchText:
     value: str
 
 
-Patch = Union[PatchProps, PatchInsertChild, PatchRemoveChild, PatchText]
+Patch = PatchProps | PatchInsertChild | PatchRemoveChild | PatchText
 
 
 class Node(Protocol):
@@ -47,15 +38,15 @@ def apply(self, patch: Patch) -> None:
 class Element(Generic[T]):
     tag: str
     props: "Props"
-    children: List[T]
+    children: list[T]
 
 
 @dataclass(slots=True, frozen=True)
 class VDomElement(Element["VDom"]):
     ...
 
 
-VDom = Union[VDomElement, str]
+VDom = VDomElement | str
 
 
 Props: TypeAlias = MutableMapping[str, Any]

tests/test_app.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import Any, Union
+from typing import Any
 
 import pytest
 
@@ -175,7 +175,7 @@ class CountDown:
     value: int = 1
 
 
-Msg = Union[CountUp, CountDown]
+Msg = CountUp | CountDown
 
 
 class TextNode(Node):