chore: Back to T | MISSING_TYPE = MISSING instead of Maybe[T] = MISSING

Author: gadenbuie

shiny/express/ui/_cm_components.py

@@ -8,7 +8,7 @@
 
 from ... import ui
 from ..._docstring import add_example, no_example
-from ...types import DEPRECATED, MISSING, MISSING_TYPE, Maybe
+from ...types import DEPRECATED, MISSING, MISSING_TYPE
 from ...ui._accordion import AccordionPanel
 from ...ui._card import CardItem
 from ...ui._layout_columns import BreakpointsUser
@@ -1080,11 +1080,11 @@ def navset_bar(
     navbar_options: Optional[NavbarOptions] = None,
     fluid: bool = True,
     # Deprecated ----
-    position: Maybe[NavbarOptionsPositionT] = DEPRECATED,
-    bg: Maybe[str | None] = DEPRECATED,
-    inverse: Maybe[bool] = DEPRECATED,
-    underline: Maybe[bool] = DEPRECATED,
-    collapsible: Maybe[bool] = DEPRECATED,
+    position: NavbarOptionsPositionT | MISSING_TYPE = DEPRECATED,
+    bg: str | None | MISSING_TYPE = DEPRECATED,
+    inverse: bool | MISSING_TYPE = DEPRECATED,
+    underline: bool | MISSING_TYPE = DEPRECATED,
+    collapsible: bool | MISSING_TYPE = DEPRECATED,
 ) -> RecallContextManager[NavSetBar]:
     """
     Context manager for a set of nav items as a tabset inside a card container.

shiny/types.py

@@ -31,7 +31,7 @@
 from htmltools import TagChild
 
 from ._docstring import add_example
-from ._typing_extensions import NotRequired, TypedDict, TypeIs
+from ._typing_extensions import NotRequired, TypedDict
 
 if TYPE_CHECKING:
     from matplotlib.figure import Figure
@@ -46,15 +46,10 @@ class MISSING_TYPE:
 
 MISSING: MISSING_TYPE = MISSING_TYPE()
 DEPRECATED: MISSING_TYPE = MISSING_TYPE()  # A MISSING that communicates deprecation
-Maybe = Union[T, MISSING_TYPE]
 
 ListOrTuple = Union[List[T], Tuple[T, ...]]
 
 
-def is_missing(x: Any) -> TypeIs[MISSING_TYPE]:
-    return isinstance(x, MISSING_TYPE)
-
-
 # Information about a single file, with a structure like:
 #   {'name': 'mtcars.csv', 'size': 1303, 'type': 'text/csv', 'datapath: '/...../mtcars.csv'}
 # The incoming data doesn't include 'datapath'; that field is added by the

shiny/ui/_navs.py

@@ -22,7 +22,7 @@
 from .._docstring import add_example
 from .._namespaces import resolve_id_or_none
 from .._utils import private_random_int
-from ..types import DEPRECATED, MISSING, Maybe, NavSetArg, is_missing
+from ..types import DEPRECATED, MISSING, MISSING_TYPE, NavSetArg
 from ._bootstrap import column, row
 from ._card import CardItem, WrapperCallable, card, card_body, card_footer, card_header
 from ._html_deps_shinyverse import components_dependencies
@@ -1013,11 +1013,11 @@ class NavbarOptions:
     def __init__(
         self,
         *,
-        position: Maybe[NavbarOptionsPositionT] = MISSING,
-        bg: Maybe[str | None] = MISSING,
-        theme: Maybe[NavbarOptionsThemeT] = MISSING,
-        underline: Maybe[bool] = MISSING,
-        collapsible: Maybe[bool] = MISSING,
+        position: NavbarOptionsPositionT | MISSING_TYPE = MISSING,
+        bg: str | None | MISSING_TYPE = MISSING,
+        theme: NavbarOptionsThemeT | MISSING_TYPE = MISSING,
+        underline: bool | MISSING_TYPE = MISSING,
+        collapsible: bool | MISSING_TYPE = MISSING,
         **attrs: TagAttrValue,
     ):
         self._is_default = {}
@@ -1037,7 +1037,7 @@ def __init__(
         self.attrs = attrs
 
     def _maybe_default(self, name: str, value: Any, default: Any):
-        if is_missing(value):
+        if isinstance(value, MISSING_TYPE):
             self._is_default[name] = True
             return default
         return value
@@ -1070,11 +1070,11 @@ def __repr__(self):
 
 @add_example()
 def navbar_options(
-    position: Maybe[NavbarOptionsPositionT] = MISSING,
-    bg: Maybe[str | None] = MISSING,
-    theme: Maybe[NavbarOptionsThemeT] = MISSING,
-    underline: Maybe[bool] = MISSING,
-    collapsible: Maybe[bool] = MISSING,
+    position: NavbarOptionsPositionT | MISSING_TYPE = MISSING,
+    bg: str | None | MISSING_TYPE = MISSING,
+    theme: NavbarOptionsThemeT | MISSING_TYPE = MISSING,
+    underline: bool | MISSING_TYPE = MISSING,
+    collapsible: bool | MISSING_TYPE = MISSING,
     **attrs: TagAttrValue,
 ) -> NavbarOptions:
     """
@@ -1120,11 +1120,11 @@ def navbar_options(
 
 def navbar_options_resolve_deprecated(
     options_user: Optional[NavbarOptions] = None,
-    position: Maybe[NavbarOptionsPositionT] = DEPRECATED,
-    bg: Maybe[str | None] = DEPRECATED,
-    inverse: Maybe[bool] = DEPRECATED,
-    underline: Maybe[bool] = DEPRECATED,
-    collapsible: Maybe[bool] = DEPRECATED,
+    position: NavbarOptionsPositionT | MISSING_TYPE = DEPRECATED,
+    bg: str | None | MISSING_TYPE = DEPRECATED,
+    inverse: bool | MISSING_TYPE = DEPRECATED,
+    underline: bool | MISSING_TYPE = DEPRECATED,
+    collapsible: bool | MISSING_TYPE = DEPRECATED,
     fn_caller: str = "navset_bar",
 ) -> NavbarOptions:
     options_user = options_user if options_user is not None else navbar_options()
@@ -1136,7 +1136,9 @@ def navbar_options_resolve_deprecated(
         "collapsible": collapsible,
         "underline": underline,
     }
-    options_old = {k: v for k, v in options_old.items() if not is_missing(v)}
+    options_old = {
+        k: v for k, v in options_old.items() if not isinstance(v, MISSING_TYPE)
+    }
 
     args_deprecated = list(options_old.keys())
 
@@ -1375,11 +1377,11 @@ def navset_bar(
     navbar_options: Optional[NavbarOptions] = None,
     fluid: bool = True,
     # Deprecated -- v1.3.0 2025-01 ----
-    position: Maybe[NavbarOptionsPositionT] = DEPRECATED,
-    bg: Maybe[str | None] = DEPRECATED,
-    inverse: Maybe[bool] = DEPRECATED,
-    underline: Maybe[bool] = DEPRECATED,
-    collapsible: Maybe[bool] = DEPRECATED,
+    position: NavbarOptionsPositionT | MISSING_TYPE = DEPRECATED,
+    bg: str | None | MISSING_TYPE = DEPRECATED,
+    inverse: bool | MISSING_TYPE = DEPRECATED,
+    underline: bool | MISSING_TYPE = DEPRECATED,
+    collapsible: bool | MISSING_TYPE = DEPRECATED,
 ) -> NavSetBar:
     """
     Render nav items as a navbar.

shiny/ui/_page.py

@@ -31,7 +31,7 @@
 
 from .._docstring import add_example, no_example
 from .._namespaces import resolve_id_or_none
-from ..types import DEPRECATED, MISSING, MISSING_TYPE, Maybe, NavSetArg
+from ..types import DEPRECATED, MISSING, MISSING_TYPE, NavSetArg
 from ._bootstrap import panel_title
 from ._html_deps_external import Theme, ThemeProvider, shiny_page_theme_deps
 from ._html_deps_py_shiny import page_output_dependency
@@ -175,11 +175,13 @@ def page_navbar(
     lang: Optional[str] = None,
     theme: Optional[str | Path | Theme | ThemeProvider] = None,
     # Deprecated -- v1.3.0 2025-01 ----
-    position: Maybe[Literal["static-top", "fixed-top", "fixed-bottom"]] = DEPRECATED,
-    bg: Maybe[str | None] = DEPRECATED,
-    inverse: Maybe[bool] = DEPRECATED,
-    underline: Maybe[bool] = DEPRECATED,
-    collapsible: Maybe[bool] = DEPRECATED,
+    position: (
+        Literal["static-top", "fixed-top", "fixed-bottom"] | MISSING_TYPE
+    ) = DEPRECATED,
+    bg: str | None | MISSING_TYPE = DEPRECATED,
+    inverse: bool | MISSING_TYPE = DEPRECATED,
+    underline: bool | MISSING_TYPE = DEPRECATED,
+    collapsible: bool | MISSING_TYPE = DEPRECATED,
 ) -> Tag:
     """
     Create a page with a navbar and a title.