Improve stubs minimizing use of Any

Author: p-vdp

stubs/geojson/geojson/base.pyi

@@ -1,16 +1,17 @@
-from collections.abc import Callable, Iterable
+from _typeshed import Incomplete
+from collections.abc import Sequence
 from typing import Any
 
 class GeoJSON(dict[str, Any]):
-    def __init__(self, iterable: Iterable[Any] = (), **extra) -> None: ...
-    def __getattr__(self, name) -> Any: ...
-    def __setattr__(self, name, value) -> None: ...
-    def __delattr__(self, name) -> None: ...
+    def __init__(self, iterable: Sequence[Incomplete] = (), **extra) -> None: ...
+    def __getattr__(self, name: str | int) -> Incomplete: ...
+    def __setattr__(self, name: str, value) -> None: ...
+    def __delattr__(self, name: str) -> None: ...
     @property
     def __geo_interface__(self) -> None | GeoJSON: ...
     @classmethod
-    def to_instance(cls, ob: Any, default: Any = None, strict: bool = False) -> Any: ...
+    def to_instance(cls, ob, default=None, strict: bool = False) -> GeoJSON: ...
     @property
     def is_valid(self) -> bool: ...
-    def check_list_errors(self, checkFunc: Callable[..., Any], lst: list[Any]) -> list[str]: ...
+    def check_list_errors(self, checkFunc, lst) -> list[str] | None: ...
     def errors(self) -> list[str] | None: ...

stubs/geojson/geojson/codec.pyi

@@ -1,31 +1,31 @@
 import json
 from _typeshed import SupportsRead, SupportsWrite
 from collections.abc import Callable
-from typing import Any
+from typing import Any, NoReturn
 
-from geojson import GeoJSON
+from geojson.base import GeoJSON
 
 class GeoJSONEncoder(json.JSONEncoder):
     def default(self, obj) -> GeoJSON: ...
 
 def dump(
-    obj: Any, fp: SupportsWrite[str], cls: type[json.JSONEncoder] | None = json.JSONEncoder, allow_nan: bool = False, **kwargs
+    obj, fp: SupportsWrite[str], cls: type[json.JSONEncoder] | None = json.JSONEncoder, allow_nan: bool = False, **kwargs
 ) -> None: ...
 def dumps(
-    obj: Any, cls: type[json.JSONEncoder] | None = json.JSONEncoder, allow_nan: bool = False, ensure_ascii: bool = False, **kwargs
+    obj, cls: type[json.JSONEncoder] | None = json.JSONEncoder, allow_nan: bool = False, ensure_ascii: bool = False, **kwargs
 ) -> str: ...
 def load(
     fp: SupportsRead[str],
     cls: type[json.JSONDecoder] = json.JSONDecoder,
-    parse_constant: Callable[[Any], None] = ...,
-    object_hook: Callable[..., GeoJSON] = GeoJSON.to_instance,
+    parse_constant: Callable[..., NoReturn] = ...,
+    object_hook: Callable[[dict[str, Any]], GeoJSON] = GeoJSON.to_instance,
     **kwargs,
 ) -> GeoJSON: ...
 def loads(
     s: str,
     cls: type[json.JSONDecoder] = json.JSONDecoder,
-    parse_constant: Callable[[Any], None] = ...,
-    object_hook: Callable[..., GeoJSON] = GeoJSON.to_instance,
+    parse_constant: Callable[..., NoReturn] = ...,
+    object_hook: Callable[[dict[str, Any]], GeoJSON] = GeoJSON.to_instance,
     **kwargs,
 ) -> GeoJSON: ...
 

stubs/geojson/geojson/examples.pyi

@@ -1,6 +1,6 @@
 from typing import Any, Literal
 
-from geojson import GeoJSON
+from geojson.base import GeoJSON
 from geojson.geometry import Geometry
 
 class SimpleWebFeature:

stubs/geojson/geojson/feature.pyi

@@ -12,4 +12,4 @@ class Feature(GeoJSON):
 class FeatureCollection(GeoJSON):
     def __init__(self, features: list[Feature | Geometry], **extra) -> None: ...
     def errors(self) -> list[str] | None: ...
-    def __getitem__(self, key) -> Feature: ...
+    def __getitem__(self, key: int | str) -> Feature: ...

stubs/geojson/geojson/geometry.pyi

@@ -1,22 +1,27 @@
-from collections.abc import Iterable
-from typing import Any
+from collections.abc import Sequence
+from decimal import Decimal
+from typing import Literal, TypeAlias
 
-from geojson import Feature
 from geojson.base import GeoJSON
 
-DEFAULT_PRECISION: int
+_InputCoord: TypeAlias = float | Decimal | Geometry | Sequence[_InputCoord]
+_CleanCoord: TypeAlias = float | Decimal | list[_CleanCoord]
+
+DEFAULT_PRECISION: Literal[6]
 
 class Geometry(GeoJSON):
     def __init__(
-        self, coordinates: None | Feature | Iterable[Any] = None, validate: bool = False, precision: None | int = None, **extra
+        self,
+        coordinates: None | Sequence[_InputCoord] | Geometry = None,
+        validate: bool = False,
+        precision: None | int = None,
+        **extra,
     ) -> None: ...
     @classmethod
-    def clean_coordinates(
-        cls, coords: Geometry | tuple[Any, ...] | list[tuple[Any, ...]], precision: None | int
-    ) -> None | tuple[Any, ...] | list[tuple[Any, ...]]: ...
+    def clean_coordinates(cls, coords: Sequence[_InputCoord] | Geometry, precision: int) -> list[_CleanCoord]: ...
 
 class GeometryCollection(GeoJSON):
-    def __init__(self, geometries=..., **extra) -> None: ...
+    def __init__(self, geometries: None | Sequence[Geometry] = None, **extra) -> None: ...
     def errors(self) -> list[str] | None: ...
     def __getitem__(self, key) -> Geometry | tuple[()] | None: ...
 
@@ -30,10 +35,10 @@ class MultiPoint(Geometry):
 
 def check_line_string(coord) -> str | None: ...
 
-class LineString(MultiPoint):
+class LineString(Geometry):
     def errors(self) -> list[str] | None: ...
 
-class MultiLineString(Geometry):
+class MultiLineString(MultiPoint):
     def errors(self) -> list[str] | None: ...
 
 def check_polygon(coord) -> str | None: ...

stubs/geojson/geojson/utils.pyi

@@ -1,15 +1,16 @@
-from collections.abc import Generator
+from _typeshed import Incomplete
+from collections.abc import Callable, Generator
 from typing import Any, Literal
 
-from geojson import Feature, GeoJSON
-from geojson.geometry import Geometry
+from geojson.base import GeoJSON
+from geojson.geometry import Geometry, LineString, Point, Polygon
 
-def coords(obj: Feature | Geometry | dict[str, Any]) -> Generator[tuple[Any]]: ...
-def map_coords(func, obj) -> dict[str, Any]: ...
-def map_tuples(func, obj) -> list[tuple[float]]: ...
-def map_geometries(func, obj) -> GeoJSON: ...
+def coords(obj: GeoJSON | dict[str, Any]) -> Generator[tuple[float]]: ...
+def map_coords(func: Callable[[Incomplete], float | Geometry], obj: GeoJSON | dict[str, Any]) -> dict[str, Any]: ...
+def map_tuples(func: Callable[[Incomplete], float | Geometry], obj: GeoJSON | dict[str, Any]) -> dict[str, Any]: ...
+def map_geometries(func: Callable[[Incomplete], float | Geometry], obj: GeoJSON | dict[str, Any]) -> dict[str, Any]: ...
 def generate_random(
     featureType: Literal["Point", "LineString", "Polygon"],
     numberVertices: int = 3,
     boundingBox: list[float] = [-180.0, -90.0, 180.0, 90.0],
-) -> Feature: ...
+) -> Point | LineString | Polygon: ...