Enable e18e/prefer-includes rule

stepankuzmin · github-actions[bot] · commit e57967be9c1a · 2026-04-24T11:13:02.000Z
GitOrigin-RevId: 46ad18ced5dc63128ebcba53b6e7ec09897eceb4
diff --git a/build/generate-struct-arrays.ts b/build/generate-struct-arrays.ts
@@ -43,7 +43,6 @@ const arraysWithStructAccessors: ArrayWithStructAccessors[] = [];
 const arrayTypeEntries = new Set();
 const layoutCache: Record<string, {className: string; members: StructArrayMember[]; size: number; usedTypes: Set<string>}> = {};
 
-// eslint-disable-next-line @typescript-eslint/no-redundant-type-constituents
 function normalizeMembers(members: StructArrayMember[], usedTypes: Set<string | ViewType>): StructArrayMember[] {
     return members.map((member) => {
         if (usedTypes && !usedTypes.has(member.type)) {
diff --git a/build/generate-style-code.ts b/build/generate-style-code.ts
@@ -231,7 +231,7 @@ const layers = Object.keys(spec.layer.type.values).map((type) => {
 
         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         if (paintSpec[name].appearance) {
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+
             appearancePaintProperties.push({
                 src: `paint_${type}`,
                 srcSection: 'paint',
@@ -262,7 +262,8 @@ const layers = Object.keys(spec.layer.type.values).map((type) => {
 });
 
 // Add -use-theme counterparts for color paint appearance properties
-// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+
+// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
 for (const prop of [...appearancePaintProperties]) {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
     if (prop.type === 'color') {
diff --git a/build/generate-typed-style-spec.ts b/build/generate-typed-style-spec.ts
@@ -113,7 +113,7 @@ function tsObjectDeclaration(key, properties, overrides = {}) {
 
 function tsObject(properties, indent, overrides = {}) {
     return `{
-${// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+${// eslint-disable-next-line @typescript-eslint/no-unsafe-argument, indent
 Object.keys(properties)
         .flatMap(k => {
             // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
@@ -421,7 +421,7 @@ ${tsObjectDeclaration('SelectorPropertySpecification', spec.selectorProperty)}
 
 ${tsObjectDeclaration('AppearanceSpecification', spec.appearance)}
 
-${// eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
+${// eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access, indent
 spec.source.map(key => {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         const sourceSpecName = tsSourceSpecificationTypeName(key);
@@ -436,14 +436,14 @@ spec.source.map(key => {
     }).join('\n\n')}
 
 export type SourceSpecification =
-${// eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-spec.source.map(key => `    | ${tsSourceSpecificationTypeName(key)}`// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+${// eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access, indent
+spec.source.map(key => `    | ${tsSourceSpecificationTypeName(key)}`// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, indent
 ).join('\n')};
 
 export type IconsetSpecification =
-${// eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-spec.iconset.map(key => `    | ${// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-tsObject(spec[key], '    ')}`// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+${// eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access, indent
+spec.iconset.map(key => `    | ${// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, indent
+tsObject(spec[key], '    ')}`// eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, indent
 ).join('\n')};
 
 export type ModelSpecification = ${tsType(spec.model)};
diff --git a/eslint.config.js b/eslint.config.js
@@ -192,7 +192,7 @@ export default tseslint.config(
 
     // Require _devtools access inside Debug.run()
     {
-        files: ['src/**/*.ts', '3d-style/**/*.ts'],
+        files: ['src/**/*.ts', '3d-style/**/*.ts', 'modules/**/*.ts'],
         ignores: ['src/ui/control/devtools.ts'],
         rules: {
             'mapbox/devtools-must-use-debug-run': 'error',
@@ -229,7 +229,7 @@ export default tseslint.config(
             'import-x/no-restricted-paths': ['error', {
                 zones: [{
                     target: './src/style-spec',
-                    from: ['./src/!(style-spec)/**/*', './3d-style/**/*'],
+                    from: ['./src/!(style-spec)/**/*', './3d-style/**/*', './modules/**/*'],
                 }],
             }],
 
@@ -259,7 +259,6 @@ export default tseslint.config(
             'e18e/prefer-array-at': 'off',
             'e18e/prefer-array-some': 'off',
             'e18e/prefer-date-now': 'off',
-            'e18e/prefer-includes': 'off',
             'e18e/prefer-object-has-own': 'off',
             'e18e/prefer-regex-test': 'off',
             'e18e/prefer-static-regex': 'off',
diff --git a/package.json b/package.json
@@ -152,7 +152,7 @@
     "start-debug": "run-p build-token watch-css watch-pmtiles watch-dev start-server",
     "prepare-release-pages": "ln -sfn $PWD/dist test/release/dist && ln -sfn $PWD/debug test/release/debug && cp debug/access_token_generated.js test/release/",
     "start-release": "run-s build-token build-prod build-esm-prod build-css print-release-url prepare-release-pages start-server",
-    "lint": "eslint --cache src 3d-style test packages modules internal",
+    "lint": "eslint --cache .",
     "lint-css": "stylelint 'src/css/mapbox-gl.css'",
     "test": "run-s lint lint-css test-typings test-unit",
     "test-suite": "run-s test-render test-query test-expressions",
diff --git a/src/data/bucket/symbol_bucket.ts b/src/data/bucket/symbol_bucket.ts
@@ -1075,7 +1075,7 @@ class SymbolBucket implements Bucket {
             if (text) {
                 const fontStack = textFont.evaluate(evaluationFeature, {}, canonical).join(',');
                 const textAlongLine = layout.get('text-rotation-alignment') === 'map' && layout.get('symbol-placement') !== 'point';
-                this.allowVerticalPlacement = this.writingModes && this.writingModes.indexOf(WritingMode.vertical) >= 0;
+                this.allowVerticalPlacement = this.writingModes && this.writingModes.includes(WritingMode.vertical);
                 for (const section of text.sections) {
                     if (!section.image) {
                         const doesAllowVerticalWritingMode = allowsVerticalWritingMode(text.toString());
diff --git a/src/gl/context.ts b/src/gl/context.ts
@@ -151,7 +151,7 @@ class Context {
         }
 
         // Force manual rendering for instanced draw calls having gl_InstanceID usage in the shader for PowerVR adapters
-        this.forceManualRenderingForInstanceIDShaders = (options && !!options.forceManualRenderingForInstanceIDShaders) || (this.renderer && this.renderer.indexOf("PowerVR") !== -1);
+        this.forceManualRenderingForInstanceIDShaders = (options && !!options.forceManualRenderingForInstanceIDShaders) || (this.renderer && this.renderer.includes("PowerVR"));
 
         this.disableSymbolUBO = (options && !!options.forceDisableSymbolUBO);
 
diff --git a/src/style-spec/composite.ts b/src/style-spec/composite.ts
@@ -34,11 +34,11 @@ export default function (style: StyleSpecification): StyleSpecification {
     };
 
     style.layers.forEach((layer) => {
-        if (styleIDs.indexOf(layer.source) >= 0) {
+        if (styleIDs.includes(layer.source)) {
             layer.source = compositeID;
 
             if ('source-layer' in layer) {
-                if (compositedSourceLayers.indexOf(layer['source-layer']) >= 0) {
+                if (compositedSourceLayers.includes(layer['source-layer'])) {
                     throw new Error('Conflicting source layer names');
                 } else {
                     compositedSourceLayers.push(layer['source-layer']);
diff --git a/src/style-spec/expression/definitions/in.ts b/src/style-spec/expression/definitions/in.ts
@@ -66,7 +66,7 @@ class In implements Expression {
         }
 
         // Type assertions safe due to isValidNativeType checks above
-        return (haystack as string | unknown[]).indexOf(needle as string) >= 0;
+        return (haystack as string | unknown[]).includes(needle as string);
     }
 
     eachChild(fn: (_: Expression) => void) {
diff --git a/src/style-spec/expression/definitions/index.ts b/src/style-spec/expression/definitions/index.ts
@@ -617,21 +617,21 @@ CompoundExpression.register(expressions, {
     'filter-type-in': [
         BooleanType,
         [array(StringType)],
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-        (ctx, [v]) => (v).value.indexOf(ctx.geometryType()) >= 0
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-return
+        (ctx, [v]) => (v).value.includes(ctx.geometryType())
     ],
     'filter-id-in': [
         BooleanType,
         [array(ValueType)],
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-        (ctx, [v]) => (v).value.indexOf(ctx.id()) >= 0
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-return
+        (ctx, [v]) => (v).value.includes(ctx.id())
     ],
     'filter-in-small': [
         BooleanType,
         [StringType, array(ValueType)],
         // assumes v is an array literal
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-        (ctx, [k, v]) => (v).value.indexOf(ctx.properties()[(k).value]) >= 0
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-return
+        (ctx, [k, v]) => (v).value.includes(ctx.properties()[(k).value])
     ],
     'filter-in-large': [
         BooleanType,
diff --git a/src/style-spec/expression/is_constant.ts b/src/style-spec/expression/is_constant.ts
@@ -57,7 +57,7 @@ function isStateConstant(e: Expression): boolean {
 }
 
 function isGlobalPropertyConstant(e: Expression, properties: Array<string>): boolean {
-    if (e instanceof CompoundExpression && properties.indexOf(e.name) >= 0) { return false; }
+    if (e instanceof CompoundExpression && properties.includes(e.name)) { return false; }
     let result = true;
     e.eachChild((arg) => {
         if (result && !isGlobalPropertyConstant(arg, properties)) { result = false; }
diff --git a/src/style-spec/util/properties.ts b/src/style-spec/util/properties.ts
@@ -6,7 +6,7 @@ function expressionHasParameter(
     expression: PropertyExpressionSpecification | null | undefined,
     parameter: ExpressionParameter,
 ): boolean {
-    return !!expression && !!expression.parameters && expression.parameters.indexOf(parameter) > -1;
+    return !!expression && !!expression.parameters && expression.parameters.includes(parameter);
 }
 
 export function supportsPropertyExpression(spec: StylePropertySpecification): boolean {
diff --git a/src/style-spec/validate/validate_enum.ts b/src/style-spec/validate/validate_enum.ts
@@ -16,12 +16,12 @@ export default function validateEnum(options: EnumValidatorOptions): ValidationE
 
     const errors: ValidationError[] = [];
     if (Array.isArray(valueSpec.values)) { // <=v7
-        if (valueSpec.values.indexOf(unbundle(value)) === -1) {
+        if (!valueSpec.values.includes(unbundle(value))) {
             // eslint-disable-next-line @typescript-eslint/no-base-to-string
             errors.push(new ValidationError(key, value, `expected one of [${valueSpec.values.join(', ')}], ${JSON.stringify(value)} found`));
         }
     } else { // >=v8
-        if (Object.keys(valueSpec.values).indexOf(unbundle(value) as string) === -1) {
+        if (!Object.keys(valueSpec.values).includes(unbundle(value) as string)) {
             errors.push(new ValidationError(key, value, `expected one of [${Object.keys(valueSpec.values).join(', ')}], ${JSON.stringify(value)} found`));
         }
     }
diff --git a/src/style-spec/validate/validate_glyphs_url.ts b/src/style-spec/validate/validate_glyphs_url.ts
@@ -11,11 +11,11 @@ export default function validateGlyphsUrl({key, value}: GlyphsUrlValidatorOption
     if (errors.length) return errors;
 
     const str = value as string;
-    if (str.indexOf('{fontstack}') === -1) {
+    if (!str.includes('{fontstack}')) {
         errors.push(new ValidationError(key, value, '"glyphs" url must include a "{fontstack}" token'));
     }
 
-    if (str.indexOf('{range}') === -1) {
+    if (!str.includes('{range}')) {
         errors.push(new ValidationError(key, value, '"glyphs" url must include a "{range}" token'));
     }
 
diff --git a/src/style-spec/validate/validate_model.ts b/src/style-spec/validate/validate_model.ts
@@ -6,7 +6,7 @@ import type {StyleSpecification} from '../types';
 
 // Allow any URL, use dummy base, if it's a relative URL
 export function isValidUrl(str: string, allowRelativeUrls: boolean): boolean {
-    const isRelative = str.indexOf('://') === -1;
+    const isRelative = !str.includes('://');
     try {
         new URL(str, isRelative && allowRelativeUrls ? 'http://example.com' : undefined);
         return true;
diff --git a/src/style/style.ts b/src/style/style.ts
@@ -1546,7 +1546,7 @@ class Style extends Evented<MapEvents> {
             return;
         }
 
-        if (source.type === 'geojson' || (source.vectorLayerIds && source.vectorLayerIds.indexOf(sourceLayer) === -1)) {
+        if (source.type === 'geojson' || (source.vectorLayerIds && !source.vectorLayerIds.includes(sourceLayer))) {
             this.fire(new ErrorEvent(new Error(
                 `Source layer "${sourceLayer}" ` +
                 `does not exist on source "${source.id}" ` +
@@ -2173,7 +2173,7 @@ class Style extends Evented<MapEvents> {
         }
 
         const builtIns = ['vector', 'raster', 'geojson', 'video', 'image'];
-        const shouldValidate = builtIns.indexOf(source.type) >= 0;
+        const shouldValidate = builtIns.includes(source.type);
         if (shouldValidate && this._validate(validateSource, `sources.${id}`, source, null, options)) return;
 
         if (this.map && this.map._collectResourceTiming) source.collectResourceTiming = true;
diff --git a/src/style/style_layer/symbol_style_layer.ts b/src/style/style_layer/symbol_style_layer.ts
@@ -135,7 +135,7 @@ class SymbolStyleLayer extends StyleLayer {
             const deduped = [];
 
             for (const m of writingModes) {
-                if (deduped.indexOf(m) < 0) deduped.push(m);
+                if (!deduped.includes(m)) deduped.push(m);
             }
             // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
             this.layout._values['text-writing-mode'] = deduped;
diff --git a/src/symbol/shaping.ts b/src/symbol/shaping.ts
@@ -512,7 +512,7 @@ function determineLineBreaks(
     const potentialLineBreaks = [];
     const targetWidth = determineAverageLineWidth(logicalInput, spacing, maxWidth, glyphMap, imagePositions, layoutTextSize, textSizeFactor);
 
-    const hasServerSuggestedBreakpoints = logicalInput.text.indexOf("\u200b") >= 0;
+    const hasServerSuggestedBreakpoints = logicalInput.text.includes("\u200b");
 
     let currentX = 0;
 
diff --git a/src/symbol/symbol_layout.ts b/src/symbol/symbol_layout.ts
@@ -474,7 +474,7 @@ export function performSymbolLayout(bucket: SymbolBucket,
                 }
                 // Add horizontal shaping for all point labels and line labels that need horizontal writing mode.
 
-                if (isPointPlacement || ((layout.get("text-writing-mode").indexOf('horizontal') >= 0) || !allowsVerticalWritingMode(unformattedText))) {
+                if (isPointPlacement || ((layout.get("text-writing-mode").includes('horizontal')) || !allowsVerticalWritingMode(unformattedText))) {
                     const shaping = shapeText(text, glyphMap, glyphPositions, imagePositions, fontstack, maxWidth, lineHeight, textAnchor, textJustify, spacingIfAllowed,
                                             textOffset, WritingMode.horizontal, false, layoutTextSize, layoutTextSizeThisZoom, pixelRatio, sizes.textScaleFactor);
                     if (shaping) shapedTextOrientations.horizontal[textJustify] = shaping;
diff --git a/src/ui/control/attribution_control.ts b/src/ui/control/attribution_control.ts
@@ -157,7 +157,7 @@ class AttributionControl implements IControl {
             const sourceCache = sourceCaches[id];
             if (sourceCache.used) {
                 const source = sourceCache.getSource();
-                if (source.attribution && attributions.indexOf(source.attribution) < 0) {
+                if (source.attribution && !attributions.includes(source.attribution)) {
                     attributions.push(source.attribution);
                 }
             }
@@ -168,7 +168,7 @@ class AttributionControl implements IControl {
         attributions.sort((a, b) => a.length - b.length);
         attributions = attributions.filter((attrib, i) => {
             for (let j = i + 1; j < attributions.length; j++) {
-                if (attributions[j].indexOf(attrib) >= 0) { return false; }
+                if (attributions[j].includes(attrib)) { return false; }
             }
             return true;
         });
diff --git a/src/ui/handler_manager.ts b/src/ui/handler_manager.ts
@@ -304,7 +304,7 @@ class HandlerManager {
     ): boolean {
         for (const name in activeHandlers) {
             if (name === myName) continue;
-            if (!allowed || allowed.indexOf(name) < 0) {
+            if (!allowed || !allowed.includes(name)) {
                 return true;
             }
         }
diff --git a/src/ui/map.ts b/src/ui/map.ts
@@ -848,7 +848,7 @@ export class Map extends Camera {
         this._controls.push(control);
 
         const positionContainer = this._controlPositions[position];
-        if (position.indexOf('bottom') !== -1) {
+        if (position.includes('bottom')) {
             positionContainer.insertBefore(controlElement, positionContainer.firstChild);
         } else {
             positionContainer.appendChild(controlElement);
@@ -895,7 +895,7 @@ export class Map extends Camera {
      * // added === true
      */
     hasControl(control: IControl): boolean {
-        return this._controls.indexOf(control) > -1;
+        return this._controls.includes(control);
     }
 
     /**
diff --git a/src/util/evented.ts b/src/util/evented.ts
@@ -45,7 +45,7 @@ type Listeners<R extends EventRegistry, Target = unknown> = {
 };
 
 function _addEventListener<R extends EventRegistry, T extends keyof R>(type: T, listener: Listener<R, T, Evented<R>>, listenerList: Listeners<R>) {
-    const listenerExists = listenerList[type] && listenerList[type].indexOf(listener) !== -1;
+    const listenerExists = listenerList[type] && listenerList[type].includes(listener);
     if (!listenerExists) {
         listenerList[type] = listenerList[type] || [];
         listenerList[type].push(listener);
diff --git a/src/util/fqid.ts b/src/util/fqid.ts
@@ -8,7 +8,7 @@ export type FQID<T> = Brand<string, T>;
 const FQIDSeparator = '\u001F';
 
 export function isFQID(id: string): boolean {
-    return id.indexOf(FQIDSeparator) >= 0;
+    return id.includes(FQIDSeparator);
 }
 
 export function makeFQID<T = string>(name: T, scope?: string | null): FQID<T> {
diff --git a/src/util/mapbox.ts b/src/util/mapbox.ts
@@ -249,7 +249,7 @@ export class RequestManager {
                 throw new Error(`Use a public access token (pk.*) with Mapbox GL, not a secret access token (sk.*). ${help}`);
         }
 
-        urlObject.params = urlObject.params.filter((d) => d.indexOf('access_token') === -1);
+        urlObject.params = urlObject.params.filter((d) => !d.includes('access_token'));
         urlObject.params.push(`access_token=${accessToken || ''}`);
         return formatUrl(urlObject);
     }
diff --git a/src/util/util.ts b/src/util/util.ts
@@ -492,7 +492,7 @@ export function mapValue(value: number, min: number, max: number, outMin: number
  */
 export function arraysIntersect<T>(a: Array<T>, b: Array<T>): boolean {
     for (let l = 0; l < a.length; l++) {
-        if (b.indexOf(a[l]) >= 0) return true;
+        if (b.includes(a[l])) return true;
     }
     return false;
 }
diff --git a/src/util/web_worker_transfer.ts b/src/util/web_worker_transfer.ts
@@ -226,7 +226,7 @@ export function serialize(input: unknown, transferables?: Set<Transferable> | nu
         const obj = input as Record<string, unknown>;
         for (const key in obj) {
             if (!obj.hasOwnProperty(key)) continue;
-            if (omit.indexOf(key) >= 0) continue;
+            if (omit.includes(key)) continue;
             properties[key] = serialize(obj[key], transferables);
         }
         if (input instanceof Error) {
diff --git a/test/build/dev.test.js b/test/build/dev.test.js
@@ -3,6 +3,6 @@ import assert from 'node:assert/strict';
 import fs from 'node:fs';
 
 test('dev build contains asserts', () => {
-    assert(fs.readFileSync('dist/mapbox-gl-dev.js', 'utf8').indexOf('canary assert') !== -1);
-    assert(fs.readFileSync('dist/mapbox-gl-dev.js', 'utf8').indexOf('canary debug run') !== -1);
+    assert(fs.readFileSync('dist/mapbox-gl-dev.js', 'utf8').includes('canary assert'));
+    assert(fs.readFileSync('dist/mapbox-gl-dev.js', 'utf8').includes('canary debug run'));
 });
diff --git a/test/build/min.test.js b/test/build/min.test.js
diff --git a/test/unit/style-spec/spec.test.ts b/test/unit/style-spec/spec.test.ts
diff --git a/test/unit/style/style.test.ts b/test/unit/style/style.test.ts
diff --git a/test/unit/util/mapbox.test.ts b/test/unit/util/mapbox.test.ts
diff --git a/vitest.config.common.ts b/vitest.config.common.ts
diff --git a/vitest.config.render.ts b/vitest.config.render.ts

Original file line number	Diff line number	Diff line change
`@@ -151,7 +151,7 @@ class Context {`
`151`	`151`	`}`
`152`	`152`
`153`	`153`	`// Force manual rendering for instanced draw calls having gl_InstanceID usage in the shader for PowerVR adapters`
`154`		`- this.forceManualRenderingForInstanceIDShaders = (options && !!options.forceManualRenderingForInstanceIDShaders) \|\| (this.renderer && this.renderer.indexOf("PowerVR") !== -1);`
	`154`	`+ this.forceManualRenderingForInstanceIDShaders = (options && !!options.forceManualRenderingForInstanceIDShaders) \|\| (this.renderer && this.renderer.includes("PowerVR"));`
`155`	`155`
`156`	`156`	`this.disableSymbolUBO = (options && !!options.forceDisableSymbolUBO);`
`157`	`157`
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ class In implements Expression {`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`// Type assertions safe due to isValidNativeType checks above`
`69`		`- return (haystack as string \| unknown[]).indexOf(needle as string) >= 0;`
	`69`	`+ return (haystack as string \| unknown[]).includes(needle as string);`
`70`	`70`	`}`
`71`	`71`
`72`	`72`	`eachChild(fn: (_: Expression) => void) {`