Fixed some invalid built JavaScript commands

AB-xdev · AB-xdev · commit 52f5ad563db5 · 2024-02-16T09:26:36.000+01:00
Fixes #330
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+## 4.2.0
+* Fixed some invalid built JavaScript commands #330
+
 ## 4.1.1
 * ⚠️ GroupId changed from ``com.xdev-software`` to ``software.xdev``
 * Updated dependencies
diff --git a/pom.xml b/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev</groupId>
 	<artifactId>vaadin-maps-leaflet-flow-root</artifactId>
-	<version>4.1.2-SNAPSHOT</version>
+	<version>4.2.0-SNAPSHOT</version>
 	<packaging>pom</packaging>
 
 	<organization>
diff --git a/vaadin-maps-leaflet-flow-demo/pom.xml b/vaadin-maps-leaflet-flow-demo/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev</groupId>
 	<artifactId>vaadin-maps-leaflet-flow-demo</artifactId>
-	<version>4.1.2-SNAPSHOT</version>
+	<version>4.2.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<inceptionYear>2019</inceptionYear>
diff --git a/vaadin-maps-leaflet-flow/pom.xml b/vaadin-maps-leaflet-flow/pom.xml
@@ -6,7 +6,7 @@
 
 	<groupId>software.xdev</groupId>
 	<artifactId>vaadin-maps-leaflet-flow</artifactId>
-	<version>4.1.2-SNAPSHOT</version>
+	<version>4.2.0-SNAPSHOT</version>
 	<packaging>jar</packaging>
 
 	<name>LeafletMap for Vaadin</name>
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/controls/LControlLayers.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/controls/LControlLayers.java
@@ -36,9 +36,9 @@ public LControlLayers(
 		final LControlLayersOptions options)
 	{
 		super(compReg, "L.control.layers("
-			+ (baselayers != null ? convertLayerMapToString(baselayers) : "")
+			+ (baselayers != null ? convertLayerMapToString(baselayers) : "{}")
 			+ "," + (overlays != null ? convertLayerMapToString(overlays) : "{}")
-			+ compReg.writeOptionsOptionalParameter(options)
+			+ compReg.writeOptionsOptionalNextParameter(options)
 			+ ")");
 	}
 	
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/LLayer.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/LLayer.java
@@ -112,7 +112,7 @@ public S removeFrom(final LLayerGroup layerGroup)
 	public S bindPopup(final String content, final LPopupOptions options)
 	{
 		this.invokeSelf(
-			".bindPopup($0, " + this.componentRegistry().writeOptionsOptionalParameter(options) + ")",
+			".bindPopup($0" + this.componentRegistry().writeOptionsOptionalNextParameter(options) + ")",
 			content);
 		return this.self();
 	}
@@ -187,7 +187,7 @@ public S closePopup()
 	public S bindTooltip(final String content, final LTooltipOptions options)
 	{
 		this.invokeSelf(
-			".bindTooltip($0, " + this.componentRegistry().writeOptionsOptionalParameter(options) + ")",
+			".bindTooltip($0" + this.componentRegistry().writeOptionsOptionalNextParameter(options) + ")",
 			content);
 		return this.self();
 	}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/raster/LImageOverlay.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/raster/LImageOverlay.java
@@ -44,10 +44,11 @@ public LImageOverlay(
 		final LLatLngBounds bounds,
 		final LImageOverlayOptions options)
 	{
-		super(compReg,
+		super(
+			compReg,
 			"L.imageOverlay($0, "
-			+ bounds.clientComponentJsAccessor()
-			+ compReg.writeOptionsOptionalParameter(options) + ")",
+				+ bounds.clientComponentJsAccessor()
+				+ compReg.writeOptionsOptionalNextParameter(options) + ")",
 			imageUrl);
 	}
 	
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/raster/LTileLayer.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/raster/LTileLayer.java
@@ -44,7 +44,7 @@ public LTileLayer(
 		final String urlTemplate,
 		final LTileLayerOptions options)
 	{
-		super(compReg, "L.tileLayer($0" + compReg.writeOptionsOptionalParameter(options) + ")", urlTemplate);
+		super(compReg, "L.tileLayer($0" + compReg.writeOptionsOptionalNextParameter(options) + ")", urlTemplate);
 	}
 	
 	public LTileLayer(
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/raster/LVideoOverlay.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/raster/LVideoOverlay.java
@@ -33,7 +33,7 @@ public LVideoOverlay(
 		super(compReg,
 			"L.videoOverlay($0, "
 				+ bounds.clientComponentJsAccessor()
-				+ compReg.writeOptionsOptionalParameter(options)
+				+ compReg.writeOptionsOptionalNextParameter(options)
 				+ ")",
 			video);
 	}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/ui/LMarker.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/ui/LMarker.java
@@ -45,7 +45,7 @@ public LMarker(
 			compReg,
 			"L.marker("
 				+ compReg.clientComponentJsAccessor(latLng)
-				+ compReg.writeOptionsOptionalParameter(options)
+				+ compReg.writeOptionsOptionalNextParameter(options)
 				+ ")");
 	}
 	
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/ui/LPopup.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/ui/LPopup.java
@@ -52,7 +52,7 @@ public LPopup(
 	{
 		super(compReg, "L.popup("
 			+ latLng.clientComponentJsAccessor()
-			+ compReg.writeOptionsOptionalParameter(options)
+			+ compReg.writeOptionsOptionalNextParameter(options)
 			+ ")");
 	}
 	
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/ui/LTooltip.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/ui/LTooltip.java
@@ -52,7 +52,7 @@ public LTooltip(
 	{
 		super(compReg, "L.tooltip("
 			+ latLng.clientComponentJsAccessor()
-			+ compReg.writeOptionsOptionalParameter(options)
+			+ compReg.writeOptionsOptionalNextParameter(options)
 			+ ")");
 	}
 	
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LCircle.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LCircle.java
@@ -31,7 +31,7 @@ public LCircle(
 	{
 		super(compReg, "L.circle("
 			+ latLng.clientComponentJsAccessor()
-			+ compReg.writeOptionsOptionalParameter(options)
+			+ compReg.writeOptionsOptionalNextParameter(options)
 			+ ")");
 	}
 	
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LCircleMarker.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LCircleMarker.java
@@ -31,7 +31,7 @@ public LCircleMarker(
 	{
 		super(compReg, "L.circleMarker("
 			+ latLng.clientComponentJsAccessor()
-			+ compReg.writeOptionsOptionalParameter(options)
+			+ compReg.writeOptionsOptionalNextParameter(options)
 			+ ")");
 	}
 	
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LPolyline.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LPolyline.java
@@ -45,7 +45,7 @@ protected LPolyline(
 	{
 		super(compReg, constructorMethod + "("
 			+ convertMultiLatLngs(latLngs)
-			+ compReg.writeOptionsOptionalParameter(options)
+			+ compReg.writeOptionsOptionalNextParameter(options)
 			+ ")");
 	}
 	
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LRectangle.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LRectangle.java
@@ -31,7 +31,7 @@ public LRectangle(
 	{
 		super(compReg, "L.rectangle("
 			+ bounds.clientComponentJsAccessor()
-			+ compReg.writeOptionsOptionalParameter(options)
+			+ compReg.writeOptionsOptionalNextParameter(options)
 			+ ")");
 	}
 	
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LSVGOverlay.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/layer/vector/LSVGOverlay.java
@@ -35,7 +35,7 @@ public LSVGOverlay(
 		super(compReg,
 			"L.svgOverlay($0, "
 				+ bounds.clientComponentJsAccessor()
-				+ compReg.writeOptionsOptionalParameter(options)
+				+ compReg.writeOptionsOptionalNextParameter(options)
 				+ ")",
 			svg);
 	}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMap.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/map/LMap.java
@@ -49,7 +49,7 @@ public LMap(
 		final String id,
 		final LMapOptions options)
 	{
-		super(compReg, "L.map($0" + compReg.writeOptionsOptionalParameter(options) + ")", id);
+		super(compReg, "L.map($0" + compReg.writeOptionsOptionalNextParameter(options) + ")", id);
 	}
 	
 	public LMap(
@@ -197,7 +197,7 @@ public LMap setView(final LLatLng center, final int zoom, final LMapZoomPanOptio
 		this.invokeSelf(".setView("
 			+ center.clientComponentJsAccessor()
 			+ "," + zoom
-			+ this.componentRegistry().writeOptionsOptionalParameter(options)
+			+ this.componentRegistry().writeOptionsOptionalNextParameter(options)
 			+ ")");
 		return this.self();
 	}
@@ -217,7 +217,7 @@ public LMap zoomIn(final Integer delta, final LMapZoomOptions options)
 	{
 		this.invokeSelf(".zoomIn("
 			+ (delta != null ? delta : "")
-			+ this.componentRegistry().writeOptionsOptionalParameter(options)
+			+ this.componentRegistry().writeOptionsOptionalNextParameter(options)
 			+ ")");
 		return this.self();
 	}
@@ -245,7 +245,7 @@ public LMap zoomOut(final Integer delta, final LMapZoomOptions options)
 	{
 		this.invokeSelf(".zoomOut("
 			+ (delta != null ? delta : "")
-			+ this.componentRegistry().writeOptionsOptionalParameter(options)
+			+ this.componentRegistry().writeOptionsOptionalNextParameter(options)
 			+ ")");
 		return this.self();
 	}
@@ -275,7 +275,7 @@ public LMap setZoomAround(final LLatLng latLng, final int zoom, final LMapZoomOp
 			".setZoomAround("
 				+ latLng.clientComponentJsAccessor()
 				+ ",$0"
-				+ this.componentRegistry().writeOptionsOptionalParameter(options)
+				+ this.componentRegistry().writeOptionsOptionalNextParameter(options)
 				+ ")",
 			zoom);
 		return this.self();
@@ -298,7 +298,7 @@ public LMap setZoomAround(final LPoint point, final int zoom, final LMapZoomOpti
 			".setZoomAround("
 				+ point.clientComponentJsAccessor()
 				+ ",$0"
-				+ this.componentRegistry().writeOptionsOptionalParameter(options)
+				+ this.componentRegistry().writeOptionsOptionalNextParameter(options)
 				+ ")",
 			zoom);
 		return this.self();
@@ -320,7 +320,7 @@ public LMap fitBounds(final LLatLngBounds bounds, final LMapFitBoundOptions opti
 		this.invokeSelf(
 			".fitBounds("
 				+ bounds.clientComponentJsAccessor()
-				+ this.componentRegistry().writeOptionsOptionalParameter(options)
+				+ this.componentRegistry().writeOptionsOptionalNextParameter(options)
 				+ ")");
 		return this.self();
 	}
@@ -404,7 +404,7 @@ public LMap flyTo(final LLatLng latLng, final Integer zoom, final LMapZoomPanOpt
 			".flyTo("
 				+ latLng.clientComponentJsAccessor()
 				+ (zoom != null ? "," + zoom : "")
-				+ this.componentRegistry().writeOptions(options)
+				+ this.componentRegistry().writeOptionsOptionalNextParameter(options)
 				+ ")");
 		return this.self();
 	}
@@ -433,7 +433,7 @@ public LMap flyToBounds(final LLatLngBounds bounds, final LMapZoomPanOptions opt
 		this.invokeSelf(
 			".flyToBounds("
 				+ bounds.clientComponentJsAccessor()
-				+ this.componentRegistry().writeOptions(options)
+				+ this.componentRegistry().writeOptionsOptionalNextParameter(options)
 				+ ")");
 		return this.self();
 	}
@@ -484,7 +484,7 @@ public LMap panInsideBounds(final LLatLngBounds bounds, final LMapPanOptions opt
 		this.invokeSelf(
 			".panInsideBounds("
 				+ bounds.clientComponentJsAccessor()
-				+ this.componentRegistry().writeOptions(options)
+				+ this.componentRegistry().writeOptionsOptionalNextParameter(options)
 				+ ")");
 		return this.self();
 	}
@@ -505,7 +505,7 @@ public LMap panInside(final LLatLng latLng, final LMapPanOptions options)
 		this.invokeSelf(
 			".panInside("
 				+ latLng.clientComponentJsAccessor()
-				+ this.componentRegistry().writeOptions(options)
+				+ this.componentRegistry().writeOptionsOptionalNextParameter(options)
 				+ ")");
 		return this.self();
 	}
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/registry/LComponentManagementRegistry.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/registry/LComponentManagementRegistry.java
@@ -36,7 +36,7 @@
 public interface LComponentManagementRegistry
 {
 	// region Write Options
-	String writeOptionsOptionalParameter(final LComponentOptions<?> options);
+	String writeOptionsOptionalNextParameter(final LComponentOptions<?> options);
 	
 	String writeOptions(final LComponentOptions<?> options);
 	
diff --git a/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/registry/LDefaultComponentManagementRegistry.java b/vaadin-maps-leaflet-flow/src/main/java/software/xdev/vaadin/maps/leaflet/registry/LDefaultComponentManagementRegistry.java
@@ -76,7 +76,7 @@ public LDefaultComponentManagementRegistry(final HasComponents parent, final Obj
 	}
 	
 	@Override
-	public String writeOptionsOptionalParameter(final LComponentOptions<?> options)
+	public String writeOptionsOptionalNextParameter(final LComponentOptions<?> options)
 	{
 		return options == null ? "" : (", " + this.writeOptionsOrEmptyObject(options));
 	}

Original file line number	Diff line number	Diff line change
`@@ -36,9 +36,9 @@ public LControlLayers(`
`36`	`36`	`final LControlLayersOptions options)`
`37`	`37`	`{`
`38`	`38`	`super(compReg, "L.control.layers("`
`39`		`- + (baselayers != null ? convertLayerMapToString(baselayers) : "")`
	`39`	`+ + (baselayers != null ? convertLayerMapToString(baselayers) : "{}")`
`40`	`40`	`+ "," + (overlays != null ? convertLayerMapToString(overlays) : "{}")`
`41`		`- + compReg.writeOptionsOptionalParameter(options)`
	`41`	`+ + compReg.writeOptionsOptionalNextParameter(options)`
`42`	`42`	`+ ")");`
`43`	`43`	`}`
`44`	`44`
Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ public S removeFrom(final LLayerGroup layerGroup)`
`112`	`112`	`public S bindPopup(final String content, final LPopupOptions options)`
`113`	`113`	`{`
`114`	`114`	`this.invokeSelf(`
`115`		`- ".bindPopup($0, " + this.componentRegistry().writeOptionsOptionalParameter(options) + ")",`
	`115`	`+ ".bindPopup($0" + this.componentRegistry().writeOptionsOptionalNextParameter(options) + ")",`
`116`	`116`	`content);`
`117`	`117`	`return this.self();`
`118`	`118`	`}`
`@@ -187,7 +187,7 @@ public S closePopup()`
`187`	`187`	`public S bindTooltip(final String content, final LTooltipOptions options)`
`188`	`188`	`{`
`189`	`189`	`this.invokeSelf(`
`190`		`- ".bindTooltip($0, " + this.componentRegistry().writeOptionsOptionalParameter(options) + ")",`
	`190`	`+ ".bindTooltip($0" + this.componentRegistry().writeOptionsOptionalNextParameter(options) + ")",`
`191`	`191`	`content);`
`192`	`192`	`return this.self();`
`193`	`193`	`}`
Original file line number	Diff line number	Diff line change
`@@ -44,10 +44,11 @@ public LImageOverlay(`
`44`	`44`	`final LLatLngBounds bounds,`
`45`	`45`	`final LImageOverlayOptions options)`
`46`	`46`	`{`
`47`		`- super(compReg,`
	`47`	`+ super(`
	`48`	`+ compReg,`
`48`	`49`	`"L.imageOverlay($0, "`
`49`		`- + bounds.clientComponentJsAccessor()`
`50`		`- + compReg.writeOptionsOptionalParameter(options) + ")",`
	`50`	`+ + bounds.clientComponentJsAccessor()`
	`51`	`+ + compReg.writeOptionsOptionalNextParameter(options) + ")",`
`51`	`52`	`imageUrl);`
`52`	`53`	`}`
`53`	`54`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ public LTileLayer(`
`44`	`44`	`final String urlTemplate,`
`45`	`45`	`final LTileLayerOptions options)`
`46`	`46`	`{`
`47`		`- super(compReg, "L.tileLayer($0" + compReg.writeOptionsOptionalParameter(options) + ")", urlTemplate);`
	`47`	`+ super(compReg, "L.tileLayer($0" + compReg.writeOptionsOptionalNextParameter(options) + ")", urlTemplate);`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`public LTileLayer(`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public LVideoOverlay(`
`33`	`33`	`super(compReg,`
`34`	`34`	`"L.videoOverlay($0, "`
`35`	`35`	`+ bounds.clientComponentJsAccessor()`
`36`		`- + compReg.writeOptionsOptionalParameter(options)`
	`36`	`+ + compReg.writeOptionsOptionalNextParameter(options)`
`37`	`37`	`+ ")",`
`38`	`38`	`video);`
`39`	`39`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public LMarker(`
`45`	`45`	`compReg,`
`46`	`46`	`"L.marker("`
`47`	`47`	`+ compReg.clientComponentJsAccessor(latLng)`
`48`		`- + compReg.writeOptionsOptionalParameter(options)`
	`48`	`+ + compReg.writeOptionsOptionalNextParameter(options)`
`49`	`49`	`+ ")");`
`50`	`50`	`}`
`51`	`51`