🤖 Merge PR DefinitelyTyped#69237 [leaflet] Forward given feature prop…

…erty type by @someonewithpc

types/leaflet/.eslintrc.json

@@ -0,0 +1,5 @@
+{
+    "rules": {
+        "@definitelytyped/no-unnecessary-generics": "off"
+    }
+}

types/leaflet/index.d.ts

@@ -2063,23 +2063,26 @@ export class Polyline<T extends geojson.GeometryObject = geojson.LineString | ge
     options: PolylineOptions;
 }
 
-export function polyline(latlngs: LatLngExpression[] | LatLngExpression[][], options?: PolylineOptions): Polyline;
+export function polyline<T extends geojson.GeometryObject = geojson.LineString | geojson.MultiLineString, P = any>(
+    latlngs: LatLngExpression[] | LatLngExpression[][],
+    options?: PolylineOptions,
+): Polyline<T, P>;
 
 export class Polygon<P = any> extends Polyline<geojson.Polygon | geojson.MultiPolygon, P> {
     constructor(latlngs: LatLngExpression[] | LatLngExpression[][] | LatLngExpression[][][], options?: PolylineOptions);
 }
 
-export function polygon(
+export function polygon<P = any>(
     latlngs: LatLngExpression[] | LatLngExpression[][] | LatLngExpression[][][],
     options?: PolylineOptions,
-): Polygon;
+): Polygon<P>;
 
 export class Rectangle<P = any> extends Polygon<P> {
     constructor(latLngBounds: LatLngBoundsExpression, options?: PolylineOptions);
     setBounds(latLngBounds: LatLngBoundsExpression): this;
 }
 
-export function rectangle(latLngBounds: LatLngBoundsExpression, options?: PolylineOptions): Rectangle;
+export function rectangle<P = any>(latLngBounds: LatLngBoundsExpression, options?: PolylineOptions): Rectangle<P>;
 
 export interface CircleMarkerOptions extends PathOptions {
     radius: number;
@@ -2098,7 +2101,7 @@ export class CircleMarker<P = any> extends Path {
     feature?: geojson.Feature<geojson.Point, P> | undefined;
 }
 
-export function circleMarker(latlng: LatLngExpression, options?: CircleMarkerOptions): CircleMarker;
+export function circleMarker<P = any>(latlng: LatLngExpression, options?: CircleMarkerOptions): CircleMarker<P>;
 
 export type CircleOptions = CircleMarkerOptions;
 
@@ -2112,8 +2115,11 @@ export class Circle<P = any> extends CircleMarker<P> {
     setStyle(style: PathOptions): this;
 }
 
-export function circle(latlng: LatLngExpression, options: CircleMarkerOptions): Circle;
-export function circle(latlng: LatLngExpression, radius: number, options: CircleMarkerOptions): Circle; // deprecated!
+export function circle<P = any>(latlng: LatLngExpression, options: CircleMarkerOptions): Circle<P>;
+/**
+ * @deprecated Passing the radius outside the options is deperecated. Use {@link circle:1} instead.
+ */
+export function circle<P = any>(latlng: LatLngExpression, radius: number, options?: CircleMarkerOptions): Circle<P>;
 
 export interface RendererOptions extends LayerOptions {
     padding?: number | undefined;
@@ -2223,7 +2229,7 @@ export class LayerGroup<P = any> extends Layer {
 /**
  * Create a layer group, optionally given an initial set of layers and an `options` object.
  */
-export function layerGroup(layers?: Layer[], options?: LayerOptions): LayerGroup;
+export function layerGroup<P = any>(layers?: Layer[], options?: LayerOptions): LayerGroup<P>;
 
 /**
  * Extended LayerGroup that also has mouse events (propagated from
@@ -2265,7 +2271,7 @@ export class FeatureGroup<P = any> extends LayerGroup<P> {
 /**
  * Create a feature group, optionally given an initial set of layers.
  */
-export function featureGroup(layers?: Layer[], options?: LayerOptions): FeatureGroup;
+export function featureGroup<P = any>(layers?: Layer[], options?: LayerOptions): FeatureGroup<P>;
 
 export type StyleFunction<P = any> = (feature?: geojson.Feature<geojson.GeometryObject, P>) => PathOptions;
 
@@ -3078,7 +3084,7 @@ export class Marker<P = any> extends Layer {
     protected _shadow: HTMLElement | undefined;
 }
 
-export function marker(latlng: LatLngExpression, options?: MarkerOptions): Marker;
+export function marker<P = any>(latlng: LatLngExpression, options?: MarkerOptions): Marker<P>;
 
 export namespace Browser {
     // sorting according to https://leafletjs.com/reference-1.5.0.html#browser

types/leaflet/leaflet-tests.ts

@@ -865,13 +865,17 @@ interface MyProperties {
     testProperty: string;
 }
 
-(L.polygon(simplePolygonLatLngs) as L.Polygon<MyProperties>).feature.properties.testProperty = "test";
+// $ExpectType MyProperties
+let polygonFeatureProperties = L.polygon<MyProperties>(simplePolygonLatLngs).feature.properties;
+polygonFeatureProperties.testProperty = "test";
 
-(L.marker([1, 2], {
+// $ExpectType MyProperties
+let markerFeatureProperties = L.marker<MyProperties>([1, 2], {
     icon: L.icon({
         iconUrl: "my-icon.png",
     }),
-}) as L.Marker<MyProperties>).feature.properties.testProperty = "test";
+}).feature.properties;
+markerFeatureProperties.testProperty = "test";
 
 let lg = L.layerGroup();
 lg = L.layerGroup([new L.Layer(), new L.Layer()]);