remove _click/types and ParamType entirely

Author: svlandeg

typer/_click/core.py

@@ -8,6 +8,7 @@
 from typing import (
     TYPE_CHECKING,
     Any,
+    ClassVar,
     Literal,
     NoReturn,
     TypeVar,
@@ -27,7 +28,6 @@
 from .globals import pop_context, push_context
 from .parser import _OptionParser
 from .termui import style
-from .types import ParamType
 from .utils import echo, make_default_short_help
 
 if TYPE_CHECKING:
@@ -818,7 +818,6 @@ class Parameter(ABC):
     def __init__(
         self,
         param_decls: Sequence[str] | None = None,
-        type: ParamType | None = None,
         required: bool = False,
         default: Any | Callable[[], Any] | None = None,
         callback: Callable[[Context, "Parameter", Any], Any] | None = None,
@@ -839,15 +838,11 @@ def __init__(
         self.name, self.opts, self.secondary_opts = self._parse_decls(
             param_decls or (), expose_value
         )
-        self.type = type if type is not None else ParamType()
 
         # Default nargs to what the type tells us if we have that
         # information available.
         if nargs is None:
-            if self.type.is_composite:
-                nargs = self.type.arity
-            else:
-                nargs = 1
+            nargs = 1
 
         self.required = required
         self.callback = callback
@@ -969,6 +964,18 @@ def resolve_envvar_value(self, ctx: Context) -> str | None:
 
         return None
 
+    envvar_list_splitter: ClassVar[str | None] = None
+
+    def split_envvar_value(self, rv: str) -> Sequence[str]:
+        """Given a value from an environment variable this splits it up
+        into small chunks depending on the defined envvar list splitter.
+
+        If the splitter is set to `None`, which means that whitespace splits,
+        then leading and trailing whitespace is ignored.  Otherwise, leading
+        and trailing splitters usually lead to empty items being included.
+        """
+        return (rv or "").split(self.envvar_list_splitter)
+
     def value_from_envvar(self, ctx: Context) -> str | Sequence[str] | None:
         """Process the value from the environment variable.
 
@@ -978,7 +985,7 @@ def value_from_envvar(self, ctx: Context) -> str | Sequence[str] | None:
         rv: Any | None = self.resolve_envvar_value(ctx)
 
         if rv is not None and (self.nargs != 1 or self.multiple):
-            rv = self.type.split_envvar_value(rv)
+            rv = self.split_envvar_value(rv)
 
         return rv
 
@@ -1031,7 +1038,6 @@ def get_error_hint(self, ctx: Context) -> str:
     def shell_complete(self, ctx: Context, incomplete: str) -> list["CompletionItem"]:
         """Return a list of completions for the incomplete value. If a
         ``shell_complete`` function was given during init, it is used.
-        Otherwise, the `type` `ParamType.shell_complete` function is used.
         """
         if self._custom_shell_complete is not None:
             results = self._custom_shell_complete(ctx, self, incomplete)

typer/_click/decorators.py

@@ -41,7 +41,6 @@ def decorator(f: Command) -> Command:
 def help_option(param_decls: list[str]) -> Callable[[Command], Command]:
     """Help option which prints the help page and exits the program."""
     from ..coercion import bool_flag_runtime_param, bool_flag_type_descriptor
-    from .types import ParamType
 
     def show_help(ctx: Context, param: Parameter, value: bool) -> None:
         """Callback that print the help page on ``<stdout>`` and exits."""
@@ -59,7 +58,6 @@ def show_help(ctx: Context, param: Parameter, value: bool) -> None:
         help="Show this message and exit.",
         callback=show_help,
         required=False,
-        type=ParamType(),
         runtime_param=bool_flag_runtime_param(),
         type_descriptor=bool_flag_type_descriptor(),
     )

typer/_click/termui.py

@@ -5,7 +5,6 @@
 
 from .exceptions import Abort, UsageError
 from .globals import resolve_color_default
-from .types import ParamType
 from .utils import LazyFile, echo
 
 if TYPE_CHECKING:
@@ -80,7 +79,7 @@ def prompt(
     default: Any | None = None,
     hide_input: bool = False,
     confirmation_prompt: bool | str = False,
-    type: ParamType | Any | None = None,
+    type: Any | None = None,
     value_proc: Callable[[str], Any] | None = None,
     prompt_suffix: str = ": ",
     show_default: bool = True,

typer/_click/types.py

@@ -10,7 +10,6 @@
 from . import adapters
 from ._click import Context
 from ._click.exceptions import BadParameter, UsageError
-from ._click.types import ParamType
 from ._typing import get_args, get_origin, is_number_type
 from .adapters import validation_context
 from .display import get_error_msg
@@ -38,7 +37,6 @@ class TypeDescriptor:
 
     annotation: ParameterAnnotation
     parameter_info: ParameterInfo
-    param_type: ParamType
     adapter: TypeAdapter[Any] | None
     file_annotation: Any | None
 
@@ -134,16 +132,14 @@ def resolve_type_descriptor(
     annotation: ParameterAnnotation,
     parameter_info: ParameterInfo,
 ) -> TypeDescriptor:
-    """Resolve ParamType and Pydantic adapter for one parameter annotation."""
-    param_type = ParamType()
+    """Resolve Pydantic adapter for one parameter annotation."""
     file_annotation = file_coercion_annotation(annotation)
     adapter = None
     if file_annotation is None:
         adapter = adapters.try_build_adapter(annotation, parameter_info)
     return TypeDescriptor(
         annotation=annotation,
         parameter_info=parameter_info,
-        param_type=param_type,
         adapter=adapter,
         file_annotation=file_annotation,
     )

typer/coercion.py

@@ -18,7 +18,6 @@
 from . import _click, param_types
 from ._click.parser import _OptionParser
 from ._click.shell_completion import CompletionItem
-from ._click.types import ParamType
 from ._typing import Literal
 from .coercion import RuntimeParam, TypeDescriptor
 from .display import describe_number_range
@@ -125,7 +124,7 @@ def value_from_envvar(self, ctx: _click.Context) -> str | Sequence[str] | None:
             if splitter is not None:
                 rv = (rv or "").split(splitter)
             else:
-                rv = self.type.split_envvar_value(rv)
+                rv = self.split_envvar_value(rv)
         return rv
 
     def shell_complete(
@@ -150,11 +149,8 @@ def shell_complete(
         # file
         if desc.is_file:
             return [CompletionItem(incomplete, type="file")]
-        # path
-        if desc.is_path:
-            return []
-        # fall-back
-        return self.type.shell_complete(ctx, self, incomplete)
+        # fall-back, specifically also required for path's
+        return []
 
     def make_metavar(self, ctx: _click.Context) -> str | None:
         return self.metavar
@@ -386,7 +382,6 @@ def __init__(
         *,
         # Parameter
         param_decls: list[str],
-        type: ParamType,
         runtime_param: RuntimeParam,
         type_descriptor: TypeDescriptor,
         required: bool = False,
@@ -430,7 +425,6 @@ def __init__(
 
         super().__init__(
             param_decls=param_decls,
-            type=type,
             required=required,
             default=default,
             callback=callback,
@@ -607,7 +601,6 @@ def __init__(
         *,
         # Parameter
         param_decls: list[str],
-        type: ParamType,
         runtime_param: RuntimeParam,
         type_descriptor: TypeDescriptor,
         required: bool = False,
@@ -656,7 +649,6 @@ def __init__(
 
         super().__init__(
             param_decls,
-            type=type,
             multiple=multiple,
             required=required,
             default=default,

typer/core.py

@@ -1484,7 +1484,6 @@ def get_param(param: ParamMeta) -> TyperArgument | TyperOption:
         annotation=annotation,
         parameter_info=parameter_info,
     )
-    parameter_type = descriptor.param_type
     runtime_param = build_runtime_param(descriptor)
     tuple_nargs = descriptor.tuple_arity
 
@@ -1513,7 +1512,6 @@ def get_param(param: ParamMeta) -> TyperArgument | TyperOption:
             multiple=is_list,
             count=parameter_info.count,
             allow_from_autoenv=parameter_info.allow_from_autoenv,
-            type=parameter_type,
             help=parameter_info.help,
             hidden=parameter_info.hidden,
             show_choices=parameter_info.show_choices,
@@ -1546,7 +1544,6 @@ def get_param(param: ParamMeta) -> TyperArgument | TyperOption:
         return TyperArgument(
             # Argument
             param_decls=param_decls,
-            type=parameter_type,
             required=required,
             nargs=nargs,
             # TyperArgument

typer/main.py

@@ -16,8 +16,6 @@
 from ._click import Context
 from ._click._compat import open_stream
 from ._click.exceptions import BadParameter
-from ._click.shell_completion import CompletionItem
-from ._click.types import ParamType
 from ._click.utils import LazyFile, format_filename, safecall
 from ._typing import get_args, get_origin, is_literal_type, is_union, literal_values
 from .display import get_error_msg
@@ -60,7 +58,7 @@ def infer_annotation_from_default(default: Any | None) -> ParameterAnnotation:
 
 
 def annotation_from_prompt(t: Any | None, default: Any | None) -> ParameterAnnotation:
-    if t is not None and not isinstance(t, ParamType):
+    if t is not None:
         return t
     return infer_annotation_from_default(default)
 
@@ -153,21 +151,6 @@ def choice_as_str(choice: Any) -> str:
     return str(choice)
 
 
-def choice_shell_complete(
-    choices: Sequence[Any],
-    *,
-    case_sensitive: bool,
-    incomplete: str,
-) -> list[CompletionItem]:
-    str_choices = map(choice_as_str, choices)
-    if case_sensitive:
-        matched = (c for c in str_choices if c.startswith(incomplete))
-    else:
-        incomplete = incomplete.lower()
-        matched = (c for c in str_choices if c.lower().startswith(incomplete))
-    return [CompletionItem(c) for c in matched]
-
-
 # PATH #
 def path_metavar_label(parameter_info: ParameterInfo) -> str:
     if parameter_info.file_okay and not parameter_info.dir_okay: