Merge branch 'main' into perf-validation

Author: dangotbanned

altair/typing.py renamed to altair/typing/__init__.py

@@ -46,9 +46,13 @@
     "ChartType",
     "EncodeKwds",
     "Optional",
+    "ThemeConfig",
     "is_chart_type",
+    "theme",
 ]
 
+from altair.typing import theme
+from altair.typing.theme import ThemeConfig
 from altair.utils.schemapi import Optional
 from altair.vegalite.v5.api import ChartType, is_chart_type
 from altair.vegalite.v5.schema.channels import (

altair/typing/theme.py

@@ -0,0 +1 @@
+from altair.vegalite.v5.schema._config import *  # noqa: F403

altair/utils/core.py

@@ -770,9 +770,21 @@ def decorate(cb: WrapsFunc[R], /) -> WrappedMethod[T, P, R] | WrappedFunc[P, R]:
     return decorate
 
 
+@overload
 def update_nested(
     original: t.MutableMapping[Any, Any],
     update: t.Mapping[Any, Any],
+    copy: Literal[False] = ...,
+) -> t.MutableMapping[Any, Any]: ...
+@overload
+def update_nested(
+    original: t.Mapping[Any, Any],
+    update: t.Mapping[Any, Any],
+    copy: Literal[True],
+) -> t.MutableMapping[Any, Any]: ...
+def update_nested(
+    original: Any,
+    update: t.Mapping[Any, Any],
     copy: bool = False,
 ) -> t.MutableMapping[Any, Any]:
     """

altair/utils/theme.py

@@ -3,9 +3,10 @@
 from __future__ import annotations
 
 import sys
-from typing import TYPE_CHECKING, Any, Dict
+from typing import TYPE_CHECKING
 
-from .plugin_registry import Plugin, PluginRegistry
+from altair.utils.plugin_registry import Plugin, PluginRegistry
+from altair.vegalite.v5.schema._config import ThemeConfig
 
 if sys.version_info >= (3, 11):
     from typing import LiteralString
@@ -16,12 +17,12 @@
     from altair.utils.plugin_registry import PluginEnabler
     from altair.vegalite.v5.theme import AltairThemes, VegaThemes
 
-ThemeType = Plugin[Dict[str, Any]]
+ThemeType = Plugin[ThemeConfig]
 
 
 # HACK: See for `LiteralString` requirement in `name`
 # https://github.com/vega/altair/pull/3526#discussion_r1743350127
-class ThemeRegistry(PluginRegistry[ThemeType, Dict[str, Any]]):
+class ThemeRegistry(PluginRegistry[ThemeType, ThemeConfig]):
     def enable(
         self, name: LiteralString | AltairThemes | VegaThemes | None = None, **options
     ) -> PluginEnabler: