Improve sql.type_api typings

Author: bryanforbes

sqlalchemy-stubs/sql/type_api.pyi

@@ -9,21 +9,28 @@ from typing import Union
 
 from typing_extensions import Protocol
 
-from . import operators as operators
-from .base import SchemaEventTarget as SchemaEventTarget
-from .visitors import Traversible as Traversible
-from .visitors import TraversibleType as TraversibleType
-from .. import exc as exc
-from .. import util as util
+from . import operators
+from .base import SchemaEventTarget
+from .elements import ClauseElement
+from .sqltypes import Boolean
+from .sqltypes import Indexable
+from .sqltypes import Integer
+from .sqltypes import MatchType
+from .sqltypes import NullType
+from .sqltypes import String
+from .sqltypes import TableValueType
+from .visitors import Traversible
+from .visitors import TraversibleType
+from .. import util
 from ..util import compat
 
-BOOLEANTYPE: Any
-INTEGERTYPE: Any
-NULLTYPE: Any
-STRINGTYPE: Any
-MATCHTYPE: Any
-INDEXABLE: Any
-TABLEVALUE: Any
+BOOLEANTYPE: Boolean
+INTEGERTYPE: Integer
+NULLTYPE: NullType
+STRINGTYPE: String
+MATCHTYPE: MatchType
+INDEXABLE = Indexable
+TABLEVALUE: TableValueType
 
 _T = TypeVar("_T")
 _T_co = TypeVar("_T_co", covariant=True)
@@ -45,17 +52,21 @@ class _ResultProcessor(Protocol[_T_co]):
     def __call__(self, __value: Optional[Any]) -> Optional[_T_co]: ...
 
 class TypeEngine(Traversible, Generic[_T]):
-    class Comparator(operators.ColumnOperators):
+    class Comparator(operators.ColumnOperators, Generic[_TE]):
         default_comparator: Any = ...
-        def __clause_element__(self): ...
-        expr: Any = ...
-        type: Any = ...
-        def __init__(self, expr: Any) -> None: ...
-        def operate(self, op: Any, *other: Any, **kwargs: Any): ...
-        def reverse_operate(self, op: Any, other: Any, **kwargs: Any): ...
-        def __reduce__(self): ...
+        def __clause_element__(self) -> ClauseElement: ...
+        expr: ClauseElement = ...
+        type: _TE = ...
+        def __init__(self, expr: ClauseElement) -> None: ...
+        def operate(
+            self, op: Any, *other: Any, **kwargs: Any
+        ) -> ClauseElement: ...
+        def reverse_operate(
+            self, op: Any, other: Any, **kwargs: Any
+        ) -> ClauseElement: ...
+        def __reduce__(self) -> Any: ...
     hashable: bool = ...
-    comparator_factory: Type[Any] = ...
+    comparator_factory: Type[Comparator[TypeEngine[_T]]] = ...
     sort_key_function: Optional[compat._SortKeyFunction] = ...
     should_evaluate_none: bool = ...
     def evaluates_none(self: _TE) -> _TE: ...
@@ -110,11 +121,15 @@ class TypeDecorator(SchemaEventTarget, TypeEngine[_T]):
     impl: Any = ...
     def __init__(self, *args: Any, **kwargs: Any) -> None: ...
     coerce_to_is_types: Tuple[Type[Any], ...] = ...
-    class Comparator(TypeEngine.Comparator):
-        def operate(self, op: Any, *other: Any, **kwargs: Any): ...
-        def reverse_operate(self, op: Any, other: Any, **kwargs: Any): ...
+    class Comparator(TypeEngine.Comparator[_TE]):
+        def operate(
+            self, op: Any, *other: Any, **kwargs: Any
+        ) -> ClauseElement: ...
+        def reverse_operate(
+            self, op: Any, other: Any, **kwargs: Any
+        ) -> ClauseElement: ...
     @property
-    def comparator_factory(self) -> Type[Any]: ...  # type: ignore[override]
+    def comparator_factory(self) -> Type[Comparator[TypeEngine[_T]]]: ...  # type: ignore[override]
     def type_engine(self, dialect: Any) -> TypeEngine[Any]: ...
     def load_dialect_impl(self, dialect: Any) -> TypeEngine[Any]: ...
     def __getattr__(self, key: Any) -> Any: ...
@@ -155,5 +170,5 @@ class Variant(TypeDecorator[_T]):
     @property
     def comparator_factory(self) -> Type[Any]: ...  # type: ignore[override]
 
-def to_instance(typeobj: Any, *arg: Any, **kw: Any): ...
-def adapt_type(typeobj: Any, colspecs: Any): ...
+def to_instance(typeobj: Any, *arg: Any, **kw: Any) -> Any: ...
+def adapt_type(typeobj: Any, colspecs: Any) -> Any: ...