Improve engine.url (#88)

Author: bryanforbes

sqlalchemy-stubs/engine/url.pyi

@@ -1,62 +1,78 @@
 from typing import Any
+from typing import Dict
+from typing import List
 from typing import Mapping
+from typing import NamedTuple
 from typing import Optional
 from typing import Sequence
 from typing import Tuple
+from typing import Type
+from typing import TypeVar
 from typing import Union
 
-from .interfaces import Dialect as Dialect
-from .. import exc as exc
-from .. import util as util
-from ..dialects import plugins as plugins
-from ..dialects import registry as registry
-from ..util import collections_abc as collections_abc
-from ..util import compat as compat
+from .interfaces import Dialect
+from .. import util
 
-class URL:
-    def __new__(self, *arg: Any, **kw: Any): ...
+_TURL = TypeVar("_TURL", bound=URL)
+
+class URL(NamedTuple):
+    drivername: str = ...
+    username: Optional[str] = ...
+    password: Optional[Union[str, object]] = ...
+    host: Optional[str] = ...
+    port: Optional[int] = ...
+    database: Optional[str] = ...
+    query: Mapping[str, Union[str, Sequence[str]]] = ...
+    def __new__(self: Type[_TURL], *arg: Any, **kw: Any) -> _TURL: ...  # type: ignore[misc]
     @classmethod
     def create(
-        cls,
+        cls: Type[_TURL],
         drivername: str,
         username: Optional[str] = ...,
         password: Optional[Union[str, object]] = ...,
         host: Optional[str] = ...,
         port: Optional[int] = ...,
         database: Optional[str] = ...,
         query: Mapping[str, Union[str, Sequence[str]]] = ...,
-    ) -> URL: ...
+    ) -> _TURL: ...
     def set(
-        self,
+        self: _TURL,
         drivername: Optional[str] = ...,
         username: Optional[str] = ...,
         password: Optional[Union[str, object]] = ...,
         host: Optional[str] = ...,
         port: Optional[int] = ...,
         database: Optional[str] = ...,
         query: Optional[Mapping[str, Union[str, Sequence[str]]]] = ...,
-    ) -> URL: ...
+    ) -> _TURL: ...
     def update_query_string(
-        self, query_string: str, append: bool = ...
-    ) -> URL: ...
+        self: _TURL, query_string: str, append: bool = ...
+    ) -> _TURL: ...
     def update_query_pairs(
-        self, key_value_pairs: Sequence[Tuple[str, str]], append: bool = ...
-    ) -> URL: ...
+        self: _TURL,
+        key_value_pairs: Sequence[Tuple[str, str]],
+        append: bool = ...,
+    ) -> _TURL: ...
     def update_query_dict(
-        self,
+        self: _TURL,
         query_parameters: Mapping[str, Union[str, Sequence[str]]],
         append: bool = ...,
-    ) -> URL: ...
-    def difference_update_query(self, names: Sequence[str]) -> URL: ...
-    def normalized_query(self): ...
+    ) -> _TURL: ...
+    def difference_update_query(
+        self: _TURL, names: Sequence[str]
+    ) -> _TURL: ...
+    @util.memoized_property
+    def normalized_query(self) -> util.immutabledict[str, Any]: ...
     def __to_string__(self, hide_password: bool = ...) -> str: ...
     def render_as_string(self, hide_password: bool = ...) -> str: ...
-    def __hash__(self) -> Any: ...
-    def __eq__(self, other: Any) -> Any: ...
-    def __ne__(self, other: Any) -> Any: ...
-    def get_backend_name(self): ...
-    def get_driver_name(self): ...
-    def get_dialect(self): ...
-    def translate_connect_args(self, names: Any = ..., **kw: Any): ...
+    def __hash__(self) -> int: ...
+    def __eq__(self, other: Any) -> bool: ...
+    def __ne__(self, other: Any) -> bool: ...
+    def get_backend_name(self) -> str: ...
+    def get_driver_name(self) -> str: ...
+    def get_dialect(self) -> Type[Dialect]: ...
+    def translate_connect_args(
+        self, names: List[str] = ..., **kw: Any
+    ) -> Dict[str, Any]: ...
 
 def make_url(name_or_url: Union[str, URL]) -> URL: ...