From 29e53aa182ab98ec8f7e4729995ab07d7a437aef Mon Sep 17 00:00:00 2001
From: Hugo Alliaume <hugo@alliau.me>
Date: Sun, 22 Jun 2025 22:06:28 +0200
Subject: [PATCH 1/2] [Map] Prefix generic types from bridges by "Bridge"

---
 .../assets/dist/abstract_map_controller.d.ts  | 100 +++++++-------
 src/Map/assets/src/abstract_map_controller.ts | 126 +++++++++---------
 2 files changed, 113 insertions(+), 113 deletions(-)

diff --git a/src/Map/assets/dist/abstract_map_controller.d.ts b/src/Map/assets/dist/abstract_map_controller.d.ts
index fe4e9038179..ebdc32022ff 100644
--- a/src/Map/assets/dist/abstract_map_controller.d.ts
+++ b/src/Map/assets/dist/abstract_map_controller.d.ts
@@ -26,55 +26,55 @@ export type Icon = {
     type: typeof IconTypes.Svg;
     html: string;
 });
-export type MarkerDefinition<MarkerOptions, InfoWindowOptions> = WithIdentifier<{
+export type MarkerDefinition<BridgeMarkerOptions, BridgeInfoWindowOptions> = WithIdentifier<{
     position: Point;
     title: string | null;
-    infoWindow?: InfoWindowWithoutPositionDefinition<InfoWindowOptions>;
+    infoWindow?: InfoWindowWithoutPositionDefinition<BridgeInfoWindowOptions>;
     icon?: Icon;
-    rawOptions?: MarkerOptions;
+    rawOptions?: BridgeMarkerOptions;
     extra: Record<string, unknown>;
 }>;
-export type PolygonDefinition<PolygonOptions, InfoWindowOptions> = WithIdentifier<{
-    infoWindow?: InfoWindowWithoutPositionDefinition<InfoWindowOptions>;
+export type PolygonDefinition<PolygonOptions, BridgeInfoWindowOptions> = WithIdentifier<{
+    infoWindow?: InfoWindowWithoutPositionDefinition<BridgeInfoWindowOptions>;
     points: Array<Point> | Array<Array<Point>>;
     title: string | null;
     rawOptions?: PolygonOptions;
     extra: Record<string, unknown>;
 }>;
-export type PolylineDefinition<PolylineOptions, InfoWindowOptions> = WithIdentifier<{
-    infoWindow?: InfoWindowWithoutPositionDefinition<InfoWindowOptions>;
+export type PolylineDefinition<PolylineOptions, BridgeInfoWindowOptions> = WithIdentifier<{
+    infoWindow?: InfoWindowWithoutPositionDefinition<BridgeInfoWindowOptions>;
     points: Array<Point>;
     title: string | null;
     rawOptions?: PolylineOptions;
     extra: Record<string, unknown>;
 }>;
-export type CircleDefinition<CircleOptions, InfoWindowOptions> = WithIdentifier<{
-    infoWindow?: InfoWindowWithoutPositionDefinition<InfoWindowOptions>;
+export type CircleDefinition<CircleOptions, BridgeInfoWindowOptions> = WithIdentifier<{
+    infoWindow?: InfoWindowWithoutPositionDefinition<BridgeInfoWindowOptions>;
     center: Point;
     radius: number;
     title: string | null;
     rawOptions?: CircleOptions;
     extra: Record<string, unknown>;
 }>;
-export type RectangleDefinition<RectangleOptions, InfoWindowOptions> = WithIdentifier<{
-    infoWindow?: InfoWindowWithoutPositionDefinition<InfoWindowOptions>;
+export type RectangleDefinition<RectangleOptions, BridgeInfoWindowOptions> = WithIdentifier<{
+    infoWindow?: InfoWindowWithoutPositionDefinition<BridgeInfoWindowOptions>;
     southWest: Point;
     northEast: Point;
     title: string | null;
     rawOptions?: RectangleOptions;
     extra: Record<string, unknown>;
 }>;
-export type InfoWindowDefinition<InfoWindowOptions> = {
+export type InfoWindowDefinition<BridgeInfoWindowOptions> = {
     headerContent: string | null;
     content: string | null;
     position: Point;
     opened: boolean;
     autoClose: boolean;
-    rawOptions?: InfoWindowOptions;
+    rawOptions?: BridgeInfoWindowOptions;
     extra: Record<string, unknown>;
 };
-export type InfoWindowWithoutPositionDefinition<InfoWindowOptions> = Omit<InfoWindowDefinition<InfoWindowOptions>, 'position'>;
-export default abstract class<MapOptions, Map, MarkerOptions, Marker, InfoWindowOptions, InfoWindow, PolygonOptions, Polygon, PolylineOptions, Polyline, CircleOptions, Circle, RectangleOptions, Rectangle> extends Controller<HTMLElement> {
+export type InfoWindowWithoutPositionDefinition<BridgeInfoWindowOptions> = Omit<InfoWindowDefinition<BridgeInfoWindowOptions>, 'position'>;
+export default abstract class<MapOptions, BridgeMap, BridgeMarkerOptions, BridgeMarker, BridgeInfoWindowOptions, BridgeInfoWindow, BridgePolygonOptions, BridgePolygon, BridgePolylineOptions, BridgePolyline, BridgeCircleOptions, BridgeCircle, BridgeRectangleOptions, BridgeRectangle> extends Controller<HTMLElement> {
     static values: {
         providerOptions: ObjectConstructor;
         center: ObjectConstructor;
@@ -90,11 +90,11 @@ export default abstract class<MapOptions, Map, MarkerOptions, Marker, InfoWindow
     centerValue: Point | null;
     zoomValue: number | null;
     fitBoundsToMarkersValue: boolean;
-    markersValue: Array<MarkerDefinition<MarkerOptions, InfoWindowOptions>>;
-    polygonsValue: Array<PolygonDefinition<PolygonOptions, InfoWindowOptions>>;
-    polylinesValue: Array<PolylineDefinition<PolylineOptions, InfoWindowOptions>>;
-    circlesValue: Array<CircleDefinition<CircleOptions, InfoWindowOptions>>;
-    rectanglesValue: Array<RectangleDefinition<RectangleOptions, InfoWindowOptions>>;
+    markersValue: Array<MarkerDefinition<BridgeMarkerOptions, BridgeInfoWindowOptions>>;
+    polygonsValue: Array<PolygonDefinition<BridgePolygonOptions, BridgeInfoWindowOptions>>;
+    polylinesValue: Array<PolylineDefinition<BridgePolylineOptions, BridgeInfoWindowOptions>>;
+    circlesValue: Array<CircleDefinition<BridgeCircleOptions, BridgeInfoWindowOptions>>;
+    rectanglesValue: Array<RectangleDefinition<BridgeRectangleOptions, BridgeInfoWindowOptions>>;
     optionsValue: MapOptions;
     hasCenterValue: boolean;
     hasZoomValue: boolean;
@@ -105,13 +105,13 @@ export default abstract class<MapOptions, Map, MarkerOptions, Marker, InfoWindow
     hasCirclesValue: boolean;
     hasRectanglesValue: boolean;
     hasOptionsValue: boolean;
-    protected map: Map;
-    protected markers: globalThis.Map<string, Marker>;
-    protected polygons: globalThis.Map<string, Polygon>;
-    protected polylines: globalThis.Map<string, Polyline>;
-    protected circles: globalThis.Map<string, Circle>;
-    protected rectangles: globalThis.Map<string, Rectangle>;
-    protected infoWindows: Array<InfoWindow>;
+    protected map: BridgeMap;
+    protected markers: Map<string, BridgeMarker>;
+    protected polygons: Map<string, BridgePolygon>;
+    protected polylines: Map<string, BridgePolyline>;
+    protected circles: Map<string, BridgeCircle>;
+    protected rectangles: Map<string, BridgeRectangle>;
+    protected infoWindows: Array<BridgeInfoWindow>;
     private isConnected;
     private createMarker;
     private createPolygon;
@@ -121,9 +121,9 @@ export default abstract class<MapOptions, Map, MarkerOptions, Marker, InfoWindow
     protected abstract dispatchEvent(name: string, payload: Record<string, unknown>): void;
     connect(): void;
     createInfoWindow({ definition, element, }: {
-        definition: InfoWindowWithoutPositionDefinition<InfoWindowOptions>;
-        element: Marker | Polygon | Polyline | Circle | Rectangle;
-    }): InfoWindow;
+        definition: InfoWindowWithoutPositionDefinition<BridgeInfoWindowOptions>;
+        element: BridgeMarker | BridgePolygon | BridgePolyline | BridgeCircle | BridgeRectangle;
+    }): BridgeInfoWindow;
     abstract centerValueChanged(): void;
     abstract zoomValueChanged(): void;
     markersValueChanged(): void;
@@ -135,35 +135,35 @@ export default abstract class<MapOptions, Map, MarkerOptions, Marker, InfoWindow
         center: Point | null;
         zoom: number | null;
         options: MapOptions;
-    }): Map;
+    }): BridgeMap;
     protected abstract doFitBoundsToMarkers(): void;
     protected abstract doCreateMarker({ definition }: {
-        definition: MarkerDefinition<MarkerOptions, InfoWindowOptions>;
-    }): Marker;
-    protected abstract doRemoveMarker(marker: Marker): void;
+        definition: MarkerDefinition<BridgeMarkerOptions, BridgeInfoWindowOptions>;
+    }): BridgeMarker;
+    protected abstract doRemoveMarker(marker: BridgeMarker): void;
     protected abstract doCreatePolygon({ definition }: {
-        definition: PolygonDefinition<PolygonOptions, InfoWindowOptions>;
-    }): Polygon;
-    protected abstract doRemovePolygon(polygon: Polygon): void;
+        definition: PolygonDefinition<BridgePolygonOptions, BridgeInfoWindowOptions>;
+    }): BridgePolygon;
+    protected abstract doRemovePolygon(polygon: BridgePolygon): void;
     protected abstract doCreatePolyline({ definition }: {
-        definition: PolylineDefinition<PolylineOptions, InfoWindowOptions>;
-    }): Polyline;
-    protected abstract doRemovePolyline(polyline: Polyline): void;
+        definition: PolylineDefinition<BridgePolylineOptions, BridgeInfoWindowOptions>;
+    }): BridgePolyline;
+    protected abstract doRemovePolyline(polyline: BridgePolyline): void;
     protected abstract doCreateCircle({ definition }: {
-        definition: CircleDefinition<CircleOptions, InfoWindowOptions>;
-    }): Circle;
-    protected abstract doRemoveCircle(circle: Circle): void;
+        definition: CircleDefinition<BridgeCircleOptions, BridgeInfoWindowOptions>;
+    }): BridgeCircle;
+    protected abstract doRemoveCircle(circle: BridgeCircle): void;
     protected abstract doCreateRectangle({ definition }: {
-        definition: RectangleDefinition<RectangleOptions, InfoWindowOptions>;
-    }): Rectangle;
-    protected abstract doRemoveRectangle(rectangle: Rectangle): void;
+        definition: RectangleDefinition<BridgeRectangleOptions, BridgeInfoWindowOptions>;
+    }): BridgeRectangle;
+    protected abstract doRemoveRectangle(rectangle: BridgeRectangle): void;
     protected abstract doCreateInfoWindow({ definition, element, }: {
-        definition: InfoWindowWithoutPositionDefinition<InfoWindowOptions>;
-        element: Marker | Polygon | Polyline | Circle | Rectangle;
-    }): InfoWindow;
+        definition: InfoWindowWithoutPositionDefinition<BridgeInfoWindowOptions>;
+        element: BridgeMarker | BridgePolygon | BridgePolyline | BridgeCircle | BridgeRectangle;
+    }): BridgeInfoWindow;
     protected abstract doCreateIcon({ definition, element }: {
         definition: Icon;
-        element: Marker;
+        element: BridgeMarker;
     }): void;
     private createDrawingFactory;
     private onDrawChanged;
diff --git a/src/Map/assets/src/abstract_map_controller.ts b/src/Map/assets/src/abstract_map_controller.ts
index 007dbe2cfca..9a1c5aedc50 100644
--- a/src/Map/assets/src/abstract_map_controller.ts
+++ b/src/Map/assets/src/abstract_map_controller.ts
@@ -28,15 +28,15 @@ export type Icon = {
       }
 );
 
-export type MarkerDefinition<MarkerOptions, InfoWindowOptions> = WithIdentifier<{
+export type MarkerDefinition<BridgeMarkerOptions, BridgeInfoWindowOptions> = WithIdentifier<{
     position: Point;
     title: string | null;
-    infoWindow?: InfoWindowWithoutPositionDefinition<InfoWindowOptions>;
+    infoWindow?: InfoWindowWithoutPositionDefinition<BridgeInfoWindowOptions>;
     icon?: Icon;
     /**
      * Raw options passed to the marker constructor, specific to the map provider (e.g.: `L.marker()` for Leaflet).
      */
-    rawOptions?: MarkerOptions;
+    rawOptions?: BridgeMarkerOptions;
     /**
      * Extra data defined by the developer.
      * They are not directly used by the Stimulus controller, but they can be used by the developer with event listeners:
@@ -46,8 +46,8 @@ export type MarkerDefinition<MarkerOptions, InfoWindowOptions> = WithIdentifier<
     extra: Record<string, unknown>;
 }>;
 
-export type PolygonDefinition<PolygonOptions, InfoWindowOptions> = WithIdentifier<{
-    infoWindow?: InfoWindowWithoutPositionDefinition<InfoWindowOptions>;
+export type PolygonDefinition<PolygonOptions, BridgeInfoWindowOptions> = WithIdentifier<{
+    infoWindow?: InfoWindowWithoutPositionDefinition<BridgeInfoWindowOptions>;
     points: Array<Point> | Array<Array<Point>>;
     title: string | null;
     /**
@@ -63,8 +63,8 @@ export type PolygonDefinition<PolygonOptions, InfoWindowOptions> = WithIdentifie
     extra: Record<string, unknown>;
 }>;
 
-export type PolylineDefinition<PolylineOptions, InfoWindowOptions> = WithIdentifier<{
-    infoWindow?: InfoWindowWithoutPositionDefinition<InfoWindowOptions>;
+export type PolylineDefinition<PolylineOptions, BridgeInfoWindowOptions> = WithIdentifier<{
+    infoWindow?: InfoWindowWithoutPositionDefinition<BridgeInfoWindowOptions>;
     points: Array<Point>;
     title: string | null;
     /**
@@ -80,8 +80,8 @@ export type PolylineDefinition<PolylineOptions, InfoWindowOptions> = WithIdentif
     extra: Record<string, unknown>;
 }>;
 
-export type CircleDefinition<CircleOptions, InfoWindowOptions> = WithIdentifier<{
-    infoWindow?: InfoWindowWithoutPositionDefinition<InfoWindowOptions>;
+export type CircleDefinition<CircleOptions, BridgeInfoWindowOptions> = WithIdentifier<{
+    infoWindow?: InfoWindowWithoutPositionDefinition<BridgeInfoWindowOptions>;
     center: Point;
     radius: number;
     title: string | null;
@@ -98,8 +98,8 @@ export type CircleDefinition<CircleOptions, InfoWindowOptions> = WithIdentifier<
     extra: Record<string, unknown>;
 }>;
 
-export type RectangleDefinition<RectangleOptions, InfoWindowOptions> = WithIdentifier<{
-    infoWindow?: InfoWindowWithoutPositionDefinition<InfoWindowOptions>;
+export type RectangleDefinition<RectangleOptions, BridgeInfoWindowOptions> = WithIdentifier<{
+    infoWindow?: InfoWindowWithoutPositionDefinition<BridgeInfoWindowOptions>;
     southWest: Point;
     northEast: Point;
     title: string | null;
@@ -116,7 +116,7 @@ export type RectangleDefinition<RectangleOptions, InfoWindowOptions> = WithIdent
     extra: Record<string, unknown>;
 }>;
 
-export type InfoWindowDefinition<InfoWindowOptions> = {
+export type InfoWindowDefinition<BridgeInfoWindowOptions> = {
     headerContent: string | null;
     content: string | null;
     position: Point;
@@ -126,7 +126,7 @@ export type InfoWindowDefinition<InfoWindowOptions> = {
      * Raw options passed to the info window constructor,
      * specific to the map provider (e.g.: `google.maps.InfoWindow()` for Google Maps).
      */
-    rawOptions?: InfoWindowOptions;
+    rawOptions?: BridgeInfoWindowOptions;
     /**
      * Extra data defined by the developer.
      * They are not directly used by the Stimulus controller, but they can be used by the developer with event listeners:
@@ -136,23 +136,23 @@ export type InfoWindowDefinition<InfoWindowOptions> = {
     extra: Record<string, unknown>;
 };
 
-export type InfoWindowWithoutPositionDefinition<InfoWindowOptions> = Omit<InfoWindowDefinition<InfoWindowOptions>, 'position'>;
+export type InfoWindowWithoutPositionDefinition<BridgeInfoWindowOptions> = Omit<InfoWindowDefinition<BridgeInfoWindowOptions>, 'position'>;
 
 export default abstract class<
-    MapOptions,
-    Map,
-    MarkerOptions,
-    Marker,
-    InfoWindowOptions,
-    InfoWindow,
-    PolygonOptions,
-    Polygon,
-    PolylineOptions,
-    Polyline,
-    CircleOptions,
-    Circle,
-    RectangleOptions,
-    Rectangle,
+    MapOptions, // Normalized `*Options` PHP class from Bridge (to not be confused with the JS Map class options)
+    BridgeMap, // The JavaScript Map class from Bridge (e.g.: `L.Map` for Leaflet, `google.maps.Map` for Google Maps)
+    BridgeMarkerOptions, // The options for the JavaScript Marker class from Bridge
+    BridgeMarker, // The JavaScript Marker class from Bridge
+    BridgeInfoWindowOptions, // The options for the JavaScript InfoWindow class from Bridge
+    BridgeInfoWindow, // The JavaScript InfoWindow class from Bridge
+    BridgePolygonOptions, // The options for the JavaScript Polygon class from Bridge
+    BridgePolygon, // The JavaScript Polygon class from Bridge
+    BridgePolylineOptions, // The options for the JavaScript Polyline class from Bridge
+    BridgePolyline, // The JavaScript Polyline class from Bridge
+    BridgeCircleOptions, // The options for the JavaScript Circle class from Bridge
+    BridgeCircle, // The JavaScript Circle class from Bridge
+    BridgeRectangleOptions, // The options for the JavaScript Rectangle class from Bridge
+    BridgeRectangle, // The JavaScript Rectangle class from Bridge
 > extends Controller<HTMLElement> {
     static values = {
         providerOptions: Object,
@@ -170,11 +170,11 @@ export default abstract class<
     declare centerValue: Point | null;
     declare zoomValue: number | null;
     declare fitBoundsToMarkersValue: boolean;
-    declare markersValue: Array<MarkerDefinition<MarkerOptions, InfoWindowOptions>>;
-    declare polygonsValue: Array<PolygonDefinition<PolygonOptions, InfoWindowOptions>>;
-    declare polylinesValue: Array<PolylineDefinition<PolylineOptions, InfoWindowOptions>>;
-    declare circlesValue: Array<CircleDefinition<CircleOptions, InfoWindowOptions>>;
-    declare rectanglesValue: Array<RectangleDefinition<RectangleOptions, InfoWindowOptions>>;
+    declare markersValue: Array<MarkerDefinition<BridgeMarkerOptions, BridgeInfoWindowOptions>>;
+    declare polygonsValue: Array<PolygonDefinition<BridgePolygonOptions, BridgeInfoWindowOptions>>;
+    declare polylinesValue: Array<PolylineDefinition<BridgePolylineOptions, BridgeInfoWindowOptions>>;
+    declare circlesValue: Array<CircleDefinition<BridgeCircleOptions, BridgeInfoWindowOptions>>;
+    declare rectanglesValue: Array<RectangleDefinition<BridgeRectangleOptions, BridgeInfoWindowOptions>>;
     declare optionsValue: MapOptions;
 
     declare hasCenterValue: boolean;
@@ -187,20 +187,20 @@ export default abstract class<
     declare hasRectanglesValue: boolean;
     declare hasOptionsValue: boolean;
 
-    protected map: Map;
-    protected markers = new Map<Identifier, Marker>();
-    protected polygons = new Map<Identifier, Polygon>();
-    protected polylines = new Map<Identifier, Polyline>();
-    protected circles = new Map<Identifier, Circle>();
-    protected rectangles = new Map<Identifier, Rectangle>();
-    protected infoWindows: Array<InfoWindow> = [];
+    protected map: BridgeMap;
+    protected markers = new Map<Identifier, BridgeMarker>();
+    protected polygons = new Map<Identifier, BridgePolygon>();
+    protected polylines = new Map<Identifier, BridgePolyline>();
+    protected circles = new Map<Identifier, BridgeCircle>();
+    protected rectangles = new Map<Identifier, BridgeRectangle>();
+    protected infoWindows: Array<BridgeInfoWindow> = [];
 
     private isConnected = false;
-    private createMarker: ({ definition }: { definition: MarkerDefinition<MarkerOptions, InfoWindowOptions> }) => Marker;
-    private createPolygon: ({ definition }: { definition: PolygonDefinition<PolygonOptions, InfoWindowOptions> }) => Polygon;
-    private createPolyline: ({ definition }: { definition: PolylineDefinition<PolylineOptions, InfoWindowOptions> }) => Polyline;
-    private createCircle: ({ definition }: { definition: CircleDefinition<CircleOptions, InfoWindowOptions> }) => Circle;
-    private createRectangle: ({ definition }: { definition: RectangleDefinition<RectangleOptions, InfoWindowOptions> }) => Rectangle;
+    private createMarker: ({ definition }: { definition: MarkerDefinition<BridgeMarkerOptions, BridgeInfoWindowOptions> }) => BridgeMarker;
+    private createPolygon: ({ definition }: { definition: PolygonDefinition<BridgePolygonOptions, BridgeInfoWindowOptions> }) => BridgePolygon;
+    private createPolyline: ({ definition }: { definition: PolylineDefinition<BridgePolylineOptions, BridgeInfoWindowOptions> }) => BridgePolyline;
+    private createCircle: ({ definition }: { definition: CircleDefinition<BridgeCircleOptions, BridgeInfoWindowOptions> }) => BridgeCircle;
+    private createRectangle: ({ definition }: { definition: RectangleDefinition<BridgeRectangleOptions, BridgeInfoWindowOptions> }) => BridgeRectangle;
 
     protected abstract dispatchEvent(name: string, payload: Record<string, unknown>): void;
 
@@ -248,9 +248,9 @@ export default abstract class<
         definition,
         element,
     }: {
-        definition: InfoWindowWithoutPositionDefinition<InfoWindowOptions>;
-        element: Marker | Polygon | Polyline | Circle | Rectangle;
-    }): InfoWindow {
+        definition: InfoWindowWithoutPositionDefinition<BridgeInfoWindowOptions>;
+        element: BridgeMarker | BridgePolygon | BridgePolyline | BridgeCircle | BridgeRectangle;
+    }): BridgeInfoWindow {
         this.dispatchEvent('info-window:before-create', { definition, element });
         const infoWindow = this.doCreateInfoWindow({ definition, element });
         this.dispatchEvent('info-window:after-create', { infoWindow, definition, element });
@@ -314,38 +314,38 @@ export default abstract class<
     //endregion
 
     //region Abstract factory methods to be implemented by the concrete classes, they are specific to the map provider
-    protected abstract doCreateMap({ center, zoom, options }: { center: Point | null; zoom: number | null; options: MapOptions }): Map;
+    protected abstract doCreateMap({ center, zoom, options }: { center: Point | null; zoom: number | null; options: MapOptions }): BridgeMap;
 
     protected abstract doFitBoundsToMarkers(): void;
 
-    protected abstract doCreateMarker({ definition }: { definition: MarkerDefinition<MarkerOptions, InfoWindowOptions> }): Marker;
+    protected abstract doCreateMarker({ definition }: { definition: MarkerDefinition<BridgeMarkerOptions, BridgeInfoWindowOptions> }): BridgeMarker;
 
-    protected abstract doRemoveMarker(marker: Marker): void;
+    protected abstract doRemoveMarker(marker: BridgeMarker): void;
 
-    protected abstract doCreatePolygon({ definition }: { definition: PolygonDefinition<PolygonOptions, InfoWindowOptions> }): Polygon;
+    protected abstract doCreatePolygon({ definition }: { definition: PolygonDefinition<BridgePolygonOptions, BridgeInfoWindowOptions> }): BridgePolygon;
 
-    protected abstract doRemovePolygon(polygon: Polygon): void;
+    protected abstract doRemovePolygon(polygon: BridgePolygon): void;
 
-    protected abstract doCreatePolyline({ definition }: { definition: PolylineDefinition<PolylineOptions, InfoWindowOptions> }): Polyline;
+    protected abstract doCreatePolyline({ definition }: { definition: PolylineDefinition<BridgePolylineOptions, BridgeInfoWindowOptions> }): BridgePolyline;
 
-    protected abstract doRemovePolyline(polyline: Polyline): void;
+    protected abstract doRemovePolyline(polyline: BridgePolyline): void;
 
-    protected abstract doCreateCircle({ definition }: { definition: CircleDefinition<CircleOptions, InfoWindowOptions> }): Circle;
+    protected abstract doCreateCircle({ definition }: { definition: CircleDefinition<BridgeCircleOptions, BridgeInfoWindowOptions> }): BridgeCircle;
 
-    protected abstract doRemoveCircle(circle: Circle): void;
+    protected abstract doRemoveCircle(circle: BridgeCircle): void;
 
-    protected abstract doCreateRectangle({ definition }: { definition: RectangleDefinition<RectangleOptions, InfoWindowOptions> }): Rectangle;
+    protected abstract doCreateRectangle({ definition }: { definition: RectangleDefinition<BridgeRectangleOptions, BridgeInfoWindowOptions> }): BridgeRectangle;
 
-    protected abstract doRemoveRectangle(rectangle: Rectangle): void;
+    protected abstract doRemoveRectangle(rectangle: BridgeRectangle): void;
 
     protected abstract doCreateInfoWindow({
         definition,
         element,
     }: {
-        definition: InfoWindowWithoutPositionDefinition<InfoWindowOptions>;
-        element: Marker | Polygon | Polyline | Circle | Rectangle;
-    }): InfoWindow;
-    protected abstract doCreateIcon({ definition, element }: { definition: Icon; element: Marker }): void;
+        definition: InfoWindowWithoutPositionDefinition<BridgeInfoWindowOptions>;
+        element: BridgeMarker | BridgePolygon | BridgePolyline | BridgeCircle | BridgeRectangle;
+    }): BridgeInfoWindow;
+    protected abstract doCreateIcon({ definition, element }: { definition: Icon; element: BridgeMarker }): void;
 
     //endregion
 

From e2aaec5ee9a6447ee1ce8d9f35f513c934d884bc Mon Sep 17 00:00:00 2001
From: Hugo Alliaume <hugo@alliau.me>
Date: Sun, 22 Jun 2025 23:33:40 +0200
Subject: [PATCH 2/2] [Map] Remove `InfoWindowWithoutPositionDefinition` type
 (it was always kinda weird)

---
 .../assets/dist/abstract_map_controller.d.ts  | 15 ++++++-----
 src/Map/assets/src/abstract_map_controller.ts | 25 ++++++++++++-------
 .../Google/assets/dist/map_controller.d.ts    |  4 +--
 .../Google/assets/src/map_controller.ts       |  4 +--
 .../Leaflet/assets/dist/map_controller.d.ts   |  4 +--
 .../Leaflet/assets/src/map_controller.ts      | 13 ++++++++--
 6 files changed, 40 insertions(+), 25 deletions(-)

diff --git a/src/Map/assets/dist/abstract_map_controller.d.ts b/src/Map/assets/dist/abstract_map_controller.d.ts
index ebdc32022ff..cf52843d7b5 100644
--- a/src/Map/assets/dist/abstract_map_controller.d.ts
+++ b/src/Map/assets/dist/abstract_map_controller.d.ts
@@ -29,27 +29,27 @@ export type Icon = {
 export type MarkerDefinition<BridgeMarkerOptions, BridgeInfoWindowOptions> = WithIdentifier<{
     position: Point;
     title: string | null;
-    infoWindow?: InfoWindowWithoutPositionDefinition<BridgeInfoWindowOptions>;
+    infoWindow?: Omit<InfoWindowDefinition<BridgeInfoWindowOptions>, 'position'>;
     icon?: Icon;
     rawOptions?: BridgeMarkerOptions;
     extra: Record<string, unknown>;
 }>;
 export type PolygonDefinition<PolygonOptions, BridgeInfoWindowOptions> = WithIdentifier<{
-    infoWindow?: InfoWindowWithoutPositionDefinition<BridgeInfoWindowOptions>;
+    infoWindow?: Omit<InfoWindowDefinition<BridgeInfoWindowOptions>, 'position'>;
     points: Array<Point> | Array<Array<Point>>;
     title: string | null;
     rawOptions?: PolygonOptions;
     extra: Record<string, unknown>;
 }>;
 export type PolylineDefinition<PolylineOptions, BridgeInfoWindowOptions> = WithIdentifier<{
-    infoWindow?: InfoWindowWithoutPositionDefinition<BridgeInfoWindowOptions>;
+    infoWindow?: Omit<InfoWindowDefinition<BridgeInfoWindowOptions>, 'position'>;
     points: Array<Point>;
     title: string | null;
     rawOptions?: PolylineOptions;
     extra: Record<string, unknown>;
 }>;
 export type CircleDefinition<CircleOptions, BridgeInfoWindowOptions> = WithIdentifier<{
-    infoWindow?: InfoWindowWithoutPositionDefinition<BridgeInfoWindowOptions>;
+    infoWindow?: Omit<InfoWindowDefinition<BridgeInfoWindowOptions>, 'position'>;
     center: Point;
     radius: number;
     title: string | null;
@@ -57,7 +57,7 @@ export type CircleDefinition<CircleOptions, BridgeInfoWindowOptions> = WithIdent
     extra: Record<string, unknown>;
 }>;
 export type RectangleDefinition<RectangleOptions, BridgeInfoWindowOptions> = WithIdentifier<{
-    infoWindow?: InfoWindowWithoutPositionDefinition<BridgeInfoWindowOptions>;
+    infoWindow?: Omit<InfoWindowDefinition<BridgeInfoWindowOptions>, 'position'>;
     southWest: Point;
     northEast: Point;
     title: string | null;
@@ -73,7 +73,6 @@ export type InfoWindowDefinition<BridgeInfoWindowOptions> = {
     rawOptions?: BridgeInfoWindowOptions;
     extra: Record<string, unknown>;
 };
-export type InfoWindowWithoutPositionDefinition<BridgeInfoWindowOptions> = Omit<InfoWindowDefinition<BridgeInfoWindowOptions>, 'position'>;
 export default abstract class<MapOptions, BridgeMap, BridgeMarkerOptions, BridgeMarker, BridgeInfoWindowOptions, BridgeInfoWindow, BridgePolygonOptions, BridgePolygon, BridgePolylineOptions, BridgePolyline, BridgeCircleOptions, BridgeCircle, BridgeRectangleOptions, BridgeRectangle> extends Controller<HTMLElement> {
     static values: {
         providerOptions: ObjectConstructor;
@@ -121,7 +120,7 @@ export default abstract class<MapOptions, BridgeMap, BridgeMarkerOptions, Bridge
     protected abstract dispatchEvent(name: string, payload: Record<string, unknown>): void;
     connect(): void;
     createInfoWindow({ definition, element, }: {
-        definition: InfoWindowWithoutPositionDefinition<BridgeInfoWindowOptions>;
+        definition: Omit<InfoWindowDefinition<BridgeInfoWindowOptions>, 'position'>;
         element: BridgeMarker | BridgePolygon | BridgePolyline | BridgeCircle | BridgeRectangle;
     }): BridgeInfoWindow;
     abstract centerValueChanged(): void;
@@ -158,7 +157,7 @@ export default abstract class<MapOptions, BridgeMap, BridgeMarkerOptions, Bridge
     }): BridgeRectangle;
     protected abstract doRemoveRectangle(rectangle: BridgeRectangle): void;
     protected abstract doCreateInfoWindow({ definition, element, }: {
-        definition: InfoWindowWithoutPositionDefinition<BridgeInfoWindowOptions>;
+        definition: Omit<InfoWindowDefinition<BridgeInfoWindowOptions>, 'position'>;
         element: BridgeMarker | BridgePolygon | BridgePolyline | BridgeCircle | BridgeRectangle;
     }): BridgeInfoWindow;
     protected abstract doCreateIcon({ definition, element }: {
diff --git a/src/Map/assets/src/abstract_map_controller.ts b/src/Map/assets/src/abstract_map_controller.ts
index 9a1c5aedc50..09b6460a75e 100644
--- a/src/Map/assets/src/abstract_map_controller.ts
+++ b/src/Map/assets/src/abstract_map_controller.ts
@@ -1,3 +1,12 @@
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 import { Controller } from '@hotwired/stimulus';
 
 export type Point = { lat: number; lng: number };
@@ -31,7 +40,7 @@ export type Icon = {
 export type MarkerDefinition<BridgeMarkerOptions, BridgeInfoWindowOptions> = WithIdentifier<{
     position: Point;
     title: string | null;
-    infoWindow?: InfoWindowWithoutPositionDefinition<BridgeInfoWindowOptions>;
+    infoWindow?: Omit<InfoWindowDefinition<BridgeInfoWindowOptions>, 'position'>;
     icon?: Icon;
     /**
      * Raw options passed to the marker constructor, specific to the map provider (e.g.: `L.marker()` for Leaflet).
@@ -47,7 +56,7 @@ export type MarkerDefinition<BridgeMarkerOptions, BridgeInfoWindowOptions> = Wit
 }>;
 
 export type PolygonDefinition<PolygonOptions, BridgeInfoWindowOptions> = WithIdentifier<{
-    infoWindow?: InfoWindowWithoutPositionDefinition<BridgeInfoWindowOptions>;
+    infoWindow?: Omit<InfoWindowDefinition<BridgeInfoWindowOptions>, 'position'>;
     points: Array<Point> | Array<Array<Point>>;
     title: string | null;
     /**
@@ -64,7 +73,7 @@ export type PolygonDefinition<PolygonOptions, BridgeInfoWindowOptions> = WithIde
 }>;
 
 export type PolylineDefinition<PolylineOptions, BridgeInfoWindowOptions> = WithIdentifier<{
-    infoWindow?: InfoWindowWithoutPositionDefinition<BridgeInfoWindowOptions>;
+    infoWindow?: Omit<InfoWindowDefinition<BridgeInfoWindowOptions>, 'position'>;
     points: Array<Point>;
     title: string | null;
     /**
@@ -81,7 +90,7 @@ export type PolylineDefinition<PolylineOptions, BridgeInfoWindowOptions> = WithI
 }>;
 
 export type CircleDefinition<CircleOptions, BridgeInfoWindowOptions> = WithIdentifier<{
-    infoWindow?: InfoWindowWithoutPositionDefinition<BridgeInfoWindowOptions>;
+    infoWindow?: Omit<InfoWindowDefinition<BridgeInfoWindowOptions>, 'position'>;
     center: Point;
     radius: number;
     title: string | null;
@@ -99,7 +108,7 @@ export type CircleDefinition<CircleOptions, BridgeInfoWindowOptions> = WithIdent
 }>;
 
 export type RectangleDefinition<RectangleOptions, BridgeInfoWindowOptions> = WithIdentifier<{
-    infoWindow?: InfoWindowWithoutPositionDefinition<BridgeInfoWindowOptions>;
+    infoWindow?: Omit<InfoWindowDefinition<BridgeInfoWindowOptions>, 'position'>;
     southWest: Point;
     northEast: Point;
     title: string | null;
@@ -136,8 +145,6 @@ export type InfoWindowDefinition<BridgeInfoWindowOptions> = {
     extra: Record<string, unknown>;
 };
 
-export type InfoWindowWithoutPositionDefinition<BridgeInfoWindowOptions> = Omit<InfoWindowDefinition<BridgeInfoWindowOptions>, 'position'>;
-
 export default abstract class<
     MapOptions, // Normalized `*Options` PHP class from Bridge (to not be confused with the JS Map class options)
     BridgeMap, // The JavaScript Map class from Bridge (e.g.: `L.Map` for Leaflet, `google.maps.Map` for Google Maps)
@@ -248,7 +255,7 @@ export default abstract class<
         definition,
         element,
     }: {
-        definition: InfoWindowWithoutPositionDefinition<BridgeInfoWindowOptions>;
+        definition: Omit<InfoWindowDefinition<BridgeInfoWindowOptions>, 'position'>;
         element: BridgeMarker | BridgePolygon | BridgePolyline | BridgeCircle | BridgeRectangle;
     }): BridgeInfoWindow {
         this.dispatchEvent('info-window:before-create', { definition, element });
@@ -342,7 +349,7 @@ export default abstract class<
         definition,
         element,
     }: {
-        definition: InfoWindowWithoutPositionDefinition<BridgeInfoWindowOptions>;
+        definition: Omit<InfoWindowDefinition<BridgeInfoWindowOptions>, 'position'>;
         element: BridgeMarker | BridgePolygon | BridgePolyline | BridgeCircle | BridgeRectangle;
     }): BridgeInfoWindow;
     protected abstract doCreateIcon({ definition, element }: { definition: Icon; element: BridgeMarker }): void;
diff --git a/src/Map/src/Bridge/Google/assets/dist/map_controller.d.ts b/src/Map/src/Bridge/Google/assets/dist/map_controller.d.ts
index 63691d2fbb1..26d01174674 100644
--- a/src/Map/src/Bridge/Google/assets/dist/map_controller.d.ts
+++ b/src/Map/src/Bridge/Google/assets/dist/map_controller.d.ts
@@ -1,5 +1,5 @@
 import type { LoaderOptions } from '@googlemaps/js-api-loader';
-import type { CircleDefinition, Icon, InfoWindowWithoutPositionDefinition, MarkerDefinition, Point, PolygonDefinition, PolylineDefinition, RectangleDefinition } from '@symfony/ux-map';
+import type { CircleDefinition, Icon, InfoWindowDefinition, MarkerDefinition, Point, PolygonDefinition, PolylineDefinition, RectangleDefinition } from '@symfony/ux-map';
 import AbstractMapController from '@symfony/ux-map';
 type MapOptions = Pick<google.maps.MapOptions, 'mapId' | 'gestureHandling' | 'backgroundColor' | 'disableDoubleClickZoom' | 'zoomControl' | 'zoomControlOptions' | 'mapTypeControl' | 'mapTypeControlOptions' | 'streetViewControl' | 'streetViewControlOptions' | 'fullscreenControl' | 'fullscreenControlOptions'>;
 export default class extends AbstractMapController<MapOptions, google.maps.Map, google.maps.marker.AdvancedMarkerElementOptions, google.maps.marker.AdvancedMarkerElement, google.maps.InfoWindowOptions, google.maps.InfoWindow, google.maps.PolygonOptions, google.maps.Polygon, google.maps.PolylineOptions, google.maps.Polyline, google.maps.CircleOptions, google.maps.Circle, google.maps.RectangleOptions, google.maps.Rectangle> {
@@ -36,7 +36,7 @@ export default class extends AbstractMapController<MapOptions, google.maps.Map,
     }): google.maps.Rectangle;
     protected doRemoveRectangle(rectangle: google.maps.Rectangle): void;
     protected doCreateInfoWindow({ definition, element, }: {
-        definition: InfoWindowWithoutPositionDefinition<google.maps.InfoWindowOptions>;
+        definition: Omit<InfoWindowDefinition<google.maps.InfoWindowOptions>, 'position'>;
         element: google.maps.marker.AdvancedMarkerElement | google.maps.Polygon | google.maps.Polyline | google.maps.Circle | google.maps.Rectangle;
     }): google.maps.InfoWindow;
     protected doFitBoundsToMarkers(): void;
diff --git a/src/Map/src/Bridge/Google/assets/src/map_controller.ts b/src/Map/src/Bridge/Google/assets/src/map_controller.ts
index 6037fb0cc68..4ede9db22e5 100644
--- a/src/Map/src/Bridge/Google/assets/src/map_controller.ts
+++ b/src/Map/src/Bridge/Google/assets/src/map_controller.ts
@@ -12,7 +12,7 @@ import { Loader } from '@googlemaps/js-api-loader';
 import type {
     CircleDefinition,
     Icon,
-    InfoWindowWithoutPositionDefinition,
+    InfoWindowDefinition,
     MarkerDefinition,
     Point,
     PolygonDefinition,
@@ -295,7 +295,7 @@ export default class extends AbstractMapController<
         definition,
         element,
     }: {
-        definition: InfoWindowWithoutPositionDefinition<google.maps.InfoWindowOptions>;
+        definition: Omit<InfoWindowDefinition<google.maps.InfoWindowOptions>, 'position'>;
         element: google.maps.marker.AdvancedMarkerElement | google.maps.Polygon | google.maps.Polyline | google.maps.Circle | google.maps.Rectangle;
     }): google.maps.InfoWindow {
         const { headerContent, content, opened, autoClose, rawOptions = {} } = definition;
diff --git a/src/Map/src/Bridge/Leaflet/assets/dist/map_controller.d.ts b/src/Map/src/Bridge/Leaflet/assets/dist/map_controller.d.ts
index 40eb259f702..69fd9658083 100644
--- a/src/Map/src/Bridge/Leaflet/assets/dist/map_controller.d.ts
+++ b/src/Map/src/Bridge/Leaflet/assets/dist/map_controller.d.ts
@@ -1,4 +1,4 @@
-import type { CircleDefinition, Icon, InfoWindowWithoutPositionDefinition, MarkerDefinition, Point, PolygonDefinition, PolylineDefinition, RectangleDefinition } from '@symfony/ux-map';
+import type { CircleDefinition, Icon, InfoWindowDefinition, MarkerDefinition, Point, PolygonDefinition, PolylineDefinition, RectangleDefinition } from '@symfony/ux-map';
 import AbstractMapController from '@symfony/ux-map';
 import 'leaflet/dist/leaflet.min.css';
 import type { CircleOptions, ControlPosition, MapOptions as LeafletMapOptions, MarkerOptions, PolylineOptions as PolygonOptions, PolylineOptions, PopupOptions, PolylineOptions as RectangleOptions } from 'leaflet';
@@ -53,7 +53,7 @@ export default class extends AbstractMapController<MapOptions, L.Map, MarkerOpti
     }): L.Rectangle;
     protected doRemoveRectangle(rectangle: L.Rectangle): void;
     protected doCreateInfoWindow({ definition, element, }: {
-        definition: InfoWindowWithoutPositionDefinition<PopupOptions>;
+        definition: Omit<InfoWindowDefinition<PopupOptions>, 'position'>;
         element: L.Marker | L.Polygon | L.Polyline | L.Circle | L.Rectangle;
     }): L.Popup;
     protected doCreateIcon({ definition, element }: {
diff --git a/src/Map/src/Bridge/Leaflet/assets/src/map_controller.ts b/src/Map/src/Bridge/Leaflet/assets/src/map_controller.ts
index 45133521756..1f13fa384c5 100644
--- a/src/Map/src/Bridge/Leaflet/assets/src/map_controller.ts
+++ b/src/Map/src/Bridge/Leaflet/assets/src/map_controller.ts
@@ -1,7 +1,16 @@
+/*
+ * This file is part of the Symfony package.
+ *
+ * (c) Fabien Potencier <fabien@symfony.com>
+ *
+ * For the full copyright and license information, please view the LICENSE
+ * file that was distributed with this source code.
+ */
+
 import type {
     CircleDefinition,
     Icon,
-    InfoWindowWithoutPositionDefinition,
+    InfoWindowDefinition,
     MarkerDefinition,
     Point,
     PolygonDefinition,
@@ -224,7 +233,7 @@ export default class extends AbstractMapController<
         definition,
         element,
     }: {
-        definition: InfoWindowWithoutPositionDefinition<PopupOptions>;
+        definition: Omit<InfoWindowDefinition<PopupOptions>, 'position'>;
         element: L.Marker | L.Polygon | L.Polyline | L.Circle | L.Rectangle;
     }): L.Popup {
         const { headerContent, content, rawOptions = {}, ...otherOptions } = definition;