chore: add logical-assignment-operators (#7409)

* add logical-assignment-operators

* apply some changes that my commit did not target

* remove nested assignments

Author: CommanderStorm

build/generate-struct-arrays.ts

@@ -113,14 +113,12 @@ function createStructArrayLayoutType({members, size, alignment}) {
     const key = `${members.map(m => `${m.components}${typeAbbreviations[m.type]}`).join('')}${size}`;
     const className = `StructArrayLayout${key}`;
 
-    if (!layoutCache[key]) {
-        layoutCache[key] = {
-            className,
-            members,
-            size,
-            usedTypes
-        };
-    }
+    layoutCache[key] ||= {
+        className,
+        members,
+        size,
+        usedTypes
+    };
 
     return className;
 }

eslint.config.js

@@ -71,6 +71,7 @@ export default [
             '@typescript-eslint/array-type': ['error', {default: 'array-simple'}],
             'local/prefer-type-for-data-shapes': 'error',
 
+            'logical-assignment-operators': ['error', 'always', {enforceForIfStatements: true}],
             'prefer-object-spread': 'error',
             'prefer-object-has-own': 'error',
             'object-shorthand': 'error',

src/data/bucket/circle_bucket.ts

@@ -97,7 +97,7 @@ export class CircleBucket<Layer extends CircleStyleLayer | HeatmapStyleLayer> im
             sortFeaturesByKey = !circleSortKey.isConstant();
 
             // Circles that are "printed" onto the map surface should be tessellated to follow the globe's curvature.
-            subdivide = subdivide || circleStyle.paint.get('circle-pitch-alignment') === 'map';
+            subdivide ||= circleStyle.paint.get('circle-pitch-alignment') === 'map';
         }
 
         const granularity = subdivide ? options.subdivisionGranularity.circle : 1;

src/data/bucket/line_bucket.ts

@@ -347,7 +347,7 @@ export class LineBucket implements Bucket {
 
             // If we still don't have a previous normal, this is the beginning of a
             // non-closed line, so we're doing a straight "join".
-            prevNormal = prevNormal || nextNormal;
+            prevNormal ||= nextNormal;
 
             // Determine the normal of the join extrusion. It is the angle bisector
             // of the segments between the previous line and the next line.

src/data/bucket/symbol_bucket.ts

@@ -478,11 +478,11 @@ export class SymbolBucket implements Bucket {
                 const formattedText = Formatted.factory(resolvedTokens);
 
                 // on this instance: if hasRTLText is already true, all future calls to containsRTLText can be skipped.
-                const bucketHasRTLText = this.hasRTLText = (this.hasRTLText || containsRTLText(formattedText));
+                this.hasRTLText ||= containsRTLText(formattedText);
                 if (
-                    !bucketHasRTLText || // non-rtl text so can proceed safely
+                    !this.hasRTLText || // non-rtl text so can proceed safely
                     rtlWorkerPlugin.getRTLTextPluginStatus() === 'unavailable' || // We don't intend to lazy-load the rtl text plugin, so proceed with incorrect shaping
-                    bucketHasRTLText && rtlWorkerPlugin.isParsed() // Use the rtlText plugin to shape text
+                    this.hasRTLText && rtlWorkerPlugin.isParsed() // Use the rtlText plugin to shape text
                 ) {
                     text = transformText(formattedText, layer, evaluationFeature);
                 }
@@ -533,8 +533,8 @@ export class SymbolBucket implements Bucket {
                     if (!section.image) {
                         const doesAllowVerticalWritingMode = allowsVerticalWritingMode(text.toString());
                         const sectionFont = section.fontStack || fontStack;
-                        const sectionStack = stacks[sectionFont] = stacks[sectionFont] || {};
-                        this.calculateGlyphDependencies(section.text, sectionStack, textAlongLine, this.allowVerticalPlacement, doesAllowVerticalWritingMode);
+                        stacks[sectionFont] ||= {};
+                        this.calculateGlyphDependencies(section.text, stacks[sectionFont], textAlongLine, this.allowVerticalPlacement, doesAllowVerticalWritingMode);
                     } else {
                         // Add section image to the list of dependencies.
                         icons[section.image.name] = true;
@@ -544,7 +544,7 @@ export class SymbolBucket implements Bucket {
         }
 
         if (layout.get('symbol-placement') === 'line') {
-            // Merge adjacent lines with the same text to improve labelling.
+            // Merge adjacent lines with the same text to improve labeling.
             // It's better to place labels on one long line than on many short segments.
             this.features = mergeLines(this.features);
         }

src/data/feature_index.ts

@@ -174,9 +174,7 @@ export class FeatureIndex {
                 serializedLayers,
                 sourceFeatureState,
                 (feature: VectorTileFeatureLike, styleLayer: StyleLayer, featureState: FeatureState) => {
-                    if (!featureGeometry) {
-                        featureGeometry = loadGeometry(feature);
-                    }
+                    featureGeometry ||= loadGeometry(feature);
 
                     return styleLayer.queryIntersectsFeature({
                         queryGeometry,

src/geo/projection/vertical_perspective_projection.ts

@@ -96,9 +96,7 @@ export class VerticalPerspectiveProjection implements Projection {
     }
 
     public updateGPUdependent(renderContext: ProjectionGPUContext): void {
-        if (!this._errorMeasurement) {
-            this._errorMeasurement = new ProjectionErrorMeasurement(renderContext);
-        }
+        this._errorMeasurement ||= new ProjectionErrorMeasurement(renderContext);
         const mercatorY = mercatorYfromLat(this._errorQueryLatitudeDegrees);
         const expectedResult = 2.0 * Math.atan(Math.exp(Math.PI - (mercatorY * Math.PI * 2.0))) - Math.PI * 0.5;
         const newValue = this._errorMeasurement.updateErrorLoop(mercatorY, expectedResult);
@@ -155,9 +153,9 @@ export class VerticalPerspectiveProjection implements Projection {
         const currentTime = now();
         let dirty = false;
         // Error correction transition
-        dirty = dirty || (currentTime - this._errorMeasurementLastChangeTime) / 1000.0 < (globeConstants.errorTransitionTimeSeconds + 0.2);
+        dirty ||= (currentTime - this._errorMeasurementLastChangeTime) / 1000.0 < (globeConstants.errorTransitionTimeSeconds + 0.2);
         // Error correction query in flight
-        dirty = dirty || (this._errorMeasurement?.awaitingQuery);
+        dirty ||= (this._errorMeasurement?.awaitingQuery);
         return dirty;
     }
 

src/render/glyph_manager.ts

@@ -78,9 +78,7 @@ export class GlyphManager {
         const result: GetGlyphsResponse = {};
 
         for (const {stack, id, glyph} of updatedGlyphs) {
-            if (!result[stack]) {
-                result[stack] = {};
-            }
+            result[stack] ||= {};
             // Clone the glyph so that our own copy of its ArrayBuffer doesn't get transferred.
             result[stack][id] = glyph && {
                 id: glyph.id,
@@ -94,14 +92,8 @@ export class GlyphManager {
 
     async _getAndCacheGlyphsPromise(stack: string, id: number): Promise<{stack: string; id: number; glyph: StyleGlyph}> {
         // Create an entry for this fontstack if it doesn’t already exist.
-        let entry = this.entries[stack];
-        if (!entry) {
-            entry = this.entries[stack] = {
-                glyphs: {},
-                requests: {},
-                ranges: {}
-            };
-        }
+        this.entries[stack] ??= {glyphs: {}, requests: {}, ranges: {}};
+        const entry = this.entries[stack];
 
         // Try to get the glyph from the cache of client-side glyphs by codepoint.
         let glyph = entry.glyphs[id];
@@ -127,9 +119,7 @@ export class GlyphManager {
         }
 
         // Start downloading this range unless we’re currently downloading it.
-        if (!entry.requests[range]) {
-            entry.requests[range] = GlyphManager.loadGlyphRange(stack, range, this.url, this.requestManager);
-        }
+        entry.requests[range] ||= GlyphManager.loadGlyphRange(stack, range, this.url, this.requestManager);
 
         try {
             // Get the response and cache the glyphs from it.
@@ -269,12 +259,8 @@ export class GlyphManager {
     destroy() {
         for (const stack in this.entries) {
             const entry = this.entries[stack];
-            if (entry.tinySDF) {
-                entry.tinySDF = null;
-            }
-            if (entry.ideographTinySDF) {
-                entry.ideographTinySDF = null;
-            }
+            entry.tinySDF = null;
+            entry.ideographTinySDF = null;
             entry.glyphs = {};
             entry.requests = {};
             entry.ranges = {};

src/render/line_atlas.ts

@@ -50,9 +50,7 @@ export class LineAtlas {
     getDash(dasharray: number[], round: boolean) {
         const key = dasharray.join(',') + String(round);
 
-        if (!this.dashEntry[key]) {
-            this.dashEntry[key] = this.addDash(dasharray, round);
-        }
+        this.dashEntry[key] ||= this.addDash(dasharray, round);
         return this.dashEntry[key];
     }
 

src/render/painter.ts

@@ -727,7 +727,7 @@ export class Painter {
      * @returns
      */
     useProgram(name: string, programConfiguration?: ProgramConfiguration | null, forceSimpleProjection: boolean = false, defines: string[] = []): Program<any> {
-        this.cache = this.cache || {};
+        this.cache ||= {};
         const useTerrain = !!this.style.map.terrain;
 
         const projection = this.style.projection;
@@ -743,19 +743,17 @@ export class Painter {
 
         const key = name + configurationKey + projectionKey + overdrawKey + terrainKey + definesKey;
 
-        if (!this.cache[key]) {
-            this.cache[key] = new Program(
-                this.context,
-                shaders[name],
-                programConfiguration,
-                programUniforms[name],
-                this._showOverdrawInspector,
-                useTerrain,
-                projectionPrelude,
-                projectionDefine,
-                defines
-            );
-        }
+        this.cache[key] ||= new Program(
+            this.context,
+            shaders[name],
+            programConfiguration,
+            programUniforms[name],
+            this._showOverdrawInspector,
+            useTerrain,
+            projectionPrelude,
+            projectionDefine,
+            defines
+        );
         return this.cache[key];
     }