Guard for-in loops and enable guard-for-in lint rule. (Leaflet#8879)

AlfredManda · Apr 15, 2023 · 423e4ab · 423e4ab
1 parent 2f0a4fe
commit 423e4ab
Show file tree

Hide file tree

Showing 19 changed files with 133 additions and 67 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -40,6 +40,7 @@ module.exports = {
 		'spaced-comment': 'error',
 		'strict': 'off',
 		'wrap-iife': 'off',
+		'guard-for-in': 'error',
 		// TODO: Re-enable the rules below and fix the linting issues.
 		'no-invalid-this': 'off',
 		'prefer-object-has-own': 'error',

diff --git a/spec/suites/dom/DomEvent.DoubleTapSpec.js b/spec/suites/dom/DomEvent.DoubleTapSpec.js
@@ -83,8 +83,8 @@ describe('DomEvent.DoubleTapSpec.js', () => {
 			detail: 2,
 			target: container
 		});
-		for (const prop in expectedProps) {
-			expect(event[prop]).to.be(expectedProps[prop]);
+		for (const [prop, expectedValue] of Object.entries(expectedProps)) {
+			expect(event[prop]).to.be(expectedValue);
 		}
 		expect(event.isTrusted).not.to.be.ok();
 	});

diff --git a/spec/suites/dom/DomEvent.PointerSpec.js b/spec/suites/dom/DomEvent.PointerSpec.js
@@ -79,9 +79,11 @@ describe('DomEvent.Pointer', () => {
 				}
 				let res;
 				for (const prop in props) {
-					res = true;
-					if (props[prop] !== evt[prop]) {
-						return false;
+					if (Object.hasOwn(props, prop)) {
+						res = true;
+						if (props[prop] !== evt[prop]) {
+							return false;
+						}
 					}
 				}
 				return res;

diff --git a/spec/suites/layer/vector/PolygonSpec.js b/spec/suites/layer/vector/PolygonSpec.js
@@ -355,8 +355,8 @@ describe('Polygon', () => {
 			polygon.addTo(map);
 			polygon.setStyle(style);
 
-			for (const prop in style) {
-				expect(polygon.options[prop]).to.be(style[prop]);
+			for (const [prop, expectedValue] of Object.entries(style)) {
+				expect(polygon.options[prop]).to.be(expectedValue);
 			}
 		});
 	});

diff --git a/spec/suites/layer/vector/PolylineSpec.js b/spec/suites/layer/vector/PolylineSpec.js
@@ -247,8 +247,8 @@ describe('Polyline', () => {
 			polyline.addTo(map);
 			polyline.setStyle(style);
 
-			for (const prop in style) {
-				expect(polyline.options[prop]).to.be(style[prop]);
+			for (const [prop, expectedValue] of Object.entries(style)) {
+				expect(polyline.options[prop]).to.be(expectedValue);
 			}
 		});
 	});
@@ -263,8 +263,8 @@ describe('Polyline', () => {
 			polyline.addTo(map);
 			polyline.setStyle(style);
 
-			for (const prop in style) {
-				expect(polyline.options[prop]).to.be(style[prop]);
+			for (const [prop, expectedValue] of Object.entries(style)) {
+				expect(polyline.options[prop]).to.be(expectedValue);
 			}
 		});
 	});

diff --git a/spec/suites/map/handler/Map.TapHoldSpec.js b/spec/suites/map/handler/Map.TapHoldSpec.js
@@ -164,8 +164,8 @@ describe('Map.TapHoldSpec.js', () => {
 			cancelable: true,
 			target: container
 		}, posStart);
-		for (const prop in expectedProps) {
-			expect(originalEvent[prop]).to.be(expectedProps[prop]);
+		for (const [prop, expectedValue] of Object.entries(expectedProps)) {
+			expect(originalEvent[prop]).to.be(expectedValue);
 		}
 	});
 });
diff --git a/src/control/Control.Layers.js b/src/control/Control.Layers.js
@@ -85,11 +85,15 @@ export const Layers = Control.extend({
 		this._handlingClick = false;
 
 		for (const i in baseLayers) {
-			this._addLayer(baseLayers[i], i);
+			if (Object.hasOwn(baseLayers, i)) {
+				this._addLayer(baseLayers[i], i);
+			}
 		}
 
 		for (const i in overlays) {
-			this._addLayer(overlays[i], i, true);
+			if (Object.hasOwn(overlays, i)) {
+				this._addLayer(overlays[i], i, true);
+			}
 		}
 	},
 

diff --git a/src/control/Control.js b/src/control/Control.js
@@ -165,7 +165,9 @@ Map.include({
 
 	_clearControlPos() {
 		for (const i in this._controlCorners) {
-			this._controlCorners[i].remove();
+			if (Object.hasOwn(this._controlCorners, i)) {
+				this._controlCorners[i].remove();
+			}
 		}
 		this._controlContainer.remove();
 		delete this._controlCorners;

diff --git a/src/core/Events.js b/src/core/Events.js
@@ -39,9 +39,11 @@ export const Events = {
 		// types can be a map of types/handlers
 		if (typeof types === 'object') {
 			for (const type in types) {
-				// we don't process space-separated events here for performance;
-				// it's a hot path since Layer uses the on(obj) syntax
-				this._on(type, types[type], fn);
+				if (Object.hasOwn(types, type)) {
+					// we don't process space-separated events here for performance;
+					// it's a hot path since Layer uses the on(obj) syntax
+					this._on(type, types[type], fn);
+				}
 			}
 
 		} else {
@@ -75,7 +77,9 @@ export const Events = {
 
 		} else if (typeof types === 'object') {
 			for (const type in types) {
-				this._off(type, types[type], fn);
+				if (Object.hasOwn(types, type)) {
+					this._off(type, types[type], fn);
+				}
 			}
 
 		} else {
@@ -272,9 +276,11 @@ export const Events = {
 		// types can be a map of types/handlers
 		if (typeof types === 'object') {
 			for (const type in types) {
-				// we don't process space-separated events here for performance;
-				// it's a hot path since Layer uses the on(obj) syntax
-				this._on(type, types[type], fn, true);
+				if (Object.hasOwn(types, type)) {
+					// we don't process space-separated events here for performance;
+					// it's a hot path since Layer uses the on(obj) syntax
+					this._on(type, types[type], fn, true);
+				}
 			}
 
 		} else {
@@ -308,10 +314,12 @@ export const Events = {
 
 	_propagateEvent(e) {
 		for (const id in this._eventParents) {
-			this._eventParents[id].fire(e.type, Util.extend({
-				layer: e.target,
-				propagatedFrom: e.target
-			}, e), true);
+			if (Object.hasOwn(this._eventParents, id)) {
+				this._eventParents[id].fire(e.type, Util.extend({
+					layer: e.target,
+					propagatedFrom: e.target
+				}, e), true);
+			}
 		}
 	}
 };

diff --git a/src/core/Util.js b/src/core/Util.js
@@ -5,13 +5,16 @@
  */
 
 // @function extend(dest: Object, src?: Object): Object
-// Merges the properties of the `src` object (or multiple objects) into `dest` object and returns the latter. Has an `L.extend` shortcut.
+// Merges the properties (including properties inherited through the prototype chain)
+// of the `src` object (or multiple objects) into `dest` object and returns the latter.
+// Has an `L.extend` shortcut.
 export function extend(dest, ...args) {
-	let i, j, len, src;
+	let j, len, src;
 
 	for (j = 0, len = args.length; j < len; j++) {
 		src = args[j];
-		for (i in src) {
+		// eslint-disable-next-line guard-for-in
+		for (const i in src) {
 			dest[i] = src[i];
 		}
 	}
@@ -104,7 +107,9 @@ export function setOptions(obj, options) {
 		obj.options = obj.options ? Object.create(obj.options) : {};
 	}
 	for (const i in options) {
-		obj.options[i] = options[i];
+		if (Object.hasOwn(options, i)) {
+			obj.options[i] = options[i];
+		}
 	}
 	return obj.options;
 }
@@ -117,7 +122,9 @@ export function setOptions(obj, options) {
 export function getParamString(obj, existingUrl, uppercase) {
 	const params = [];
 	for (const i in obj) {
-		params.push(`${encodeURIComponent(uppercase ? i.toUpperCase() : i)}=${encodeURIComponent(obj[i])}`);
+		if (Object.hasOwn(obj, i)) {
+			params.push(`${encodeURIComponent(uppercase ? i.toUpperCase() : i)}=${encodeURIComponent(obj[i])}`);
+		}
 	}
 	return ((!existingUrl || !existingUrl.includes('?')) ? '?' : '&') + params.join('&');
 }

diff --git a/src/dom/DomEvent.Pointer.js b/src/dom/DomEvent.Pointer.js
@@ -71,7 +71,9 @@ function _handlePointer(handler, e) {
 
 	e.touches = [];
 	for (const i in _pointers) {
-		e.touches.push(_pointers[i]);
+		if (Object.hasOwn(_pointers, i)) {
+			e.touches.push(_pointers[i]);
+		}
 	}
 	e.changedTouches = [e];
 

diff --git a/src/dom/DomEvent.js b/src/dom/DomEvent.js
@@ -24,8 +24,8 @@ import {getScale} from './DomUtil.js';
 export function on(obj, types, fn, context) {
 
 	if (types && typeof types === 'object') {
-		for (const type in types) {
-			addOne(obj, type, types[type], fn);
+		for (const [type, listener] of Object.entries(types)) {
+			addOne(obj, type, listener, fn);
 		}
 	} else {
 		types = Util.splitWords(types);
@@ -63,8 +63,8 @@ export function off(obj, types, fn, context) {
 		delete obj[eventsKey];
 
 	} else if (types && typeof types === 'object') {
-		for (const type in types) {
-			removeOne(obj, type, types[type], fn);
+		for (const [type, listener] of Object.entries(types)) {
+			removeOne(obj, type, listener, fn);
 		}
 
 	} else {
@@ -84,9 +84,11 @@ export function off(obj, types, fn, context) {
 
 function batchRemove(obj, filterFn) {
 	for (const id in obj[eventsKey]) {
-		const type = id.split(/\d/)[0];
-		if (!filterFn || filterFn(type)) {
-			removeOne(obj, type, null, null, id);
+		if (Object.hasOwn(obj[eventsKey], id)) {
+			const type = id.split(/\d/)[0];
+			if (!filterFn || filterFn(type)) {
+				removeOne(obj, type, null, null, id);
+			}
 		}
 	}
 }

diff --git a/src/layer/FeatureGroup.js b/src/layer/FeatureGroup.js
@@ -80,8 +80,10 @@ export const FeatureGroup = LayerGroup.extend({
 		const bounds = new LatLngBounds();
 
 		for (const id in this._layers) {
-			const layer = this._layers[id];
-			bounds.extend(layer.getBounds ? layer.getBounds() : layer.getLatLng());
+			if (Object.hasOwn(this._layers, id)) {
+				const layer = this._layers[id];
+				bounds.extend(layer.getBounds ? layer.getBounds() : layer.getLatLng());
+			}
 		}
 		return bounds;
 	}

diff --git a/src/layer/Layer.js b/src/layer/Layer.js
@@ -213,7 +213,9 @@ Map.include({
 	 */
 	eachLayer(method, context) {
 		for (const i in this._layers) {
-			method.call(context, this._layers[i]);
+			if (Object.hasOwn(this._layers, i)) {
+				method.call(context, this._layers[i]);
+			}
 		}
 		return this;
 	},
@@ -248,10 +250,12 @@ Map.include({
 		const oldZoomSpan = this._getZoomSpan();
 
 		for (const i in this._zoomBoundLayers) {
-			const options = this._zoomBoundLayers[i].options;
+			if (Object.hasOwn(this._zoomBoundLayers, i)) {
+				const options = this._zoomBoundLayers[i].options;
 
-			minZoom = options.minZoom === undefined ? minZoom : Math.min(minZoom, options.minZoom);
-			maxZoom = options.maxZoom === undefined ? maxZoom : Math.max(maxZoom, options.maxZoom);
+				minZoom = options.minZoom === undefined ? minZoom : Math.min(minZoom, options.minZoom);
+				maxZoom = options.maxZoom === undefined ? maxZoom : Math.max(maxZoom, options.maxZoom);
+			}
 		}
 
 		this._layersMaxZoom = maxZoom === -Infinity ? undefined : maxZoom;

diff --git a/src/layer/LayerGroup.js b/src/layer/LayerGroup.js
@@ -91,10 +91,12 @@ export const LayerGroup = Layer.extend({
 		let i, layer;
 
 		for (i in this._layers) {
-			layer = this._layers[i];
+			if (Object.hasOwn(this._layers, i)) {
+				layer = this._layers[i];
 
-			if (layer[methodName]) {
-				layer[methodName].apply(layer, args);
+				if (layer[methodName]) {
+					layer[methodName].apply(layer, args);
+				}
 			}
 		}
 
@@ -118,7 +120,9 @@ export const LayerGroup = Layer.extend({
 	// ```
 	eachLayer(method, context) {
 		for (const i in this._layers) {
-			method.call(context, this._layers[i]);
+			if (Object.hasOwn(this._layers, i)) {
+				method.call(context, this._layers[i]);
+			}
 		}
 		return this;
 	},