Upgrade Flow to v0.188.0

.flowconfig

@@ -30,7 +30,7 @@
 .*/test/build/downstream-flow-fixture/.*
 
 [version]
-0.152.0
+0.188.0
 
 [options]
 

bench/lib/benchmark.js

@@ -97,6 +97,7 @@ class Benchmark {
         return this._end();
     }
 
+    // $FlowFixMe[duplicate-class-member]
     _measureAsync(): Promise<Array<Measurement>> {
         const time = performance.now() - this._start;
         this._elapsed += time;

bench/lib/tile_parser.js

@@ -102,7 +102,7 @@ export default class TileParser {
         return Promise.all([
             createStyle(this.styleJSON),
             fetchTileJSON(mapStub._requestManager, (this.styleJSON.sources[this.sourceID]: any).url)
-        ]).then(([style: Style, tileJSON: TileJSON]) => {
+        ]).then(([style, tileJSON]: [Style, TileJSON]) => {
             this.style = style;
             this.tileJSON = tileJSON;
         });

flow-typed/geojson.js

@@ -27,12 +27,12 @@ declare module "@mapbox/geojson-types" {
         geometries: Array<GeoJSONGeometry>
     };
 
-    declare export type GeoJSONFeature = {
-        type: 'Feature',
-        geometry: ?GeoJSONGeometry,
-        properties: ?{},
-        id?: number | string
-    };
+    declare export interface GeoJSONFeature {
+        type: 'Feature';
+        geometry: ?GeoJSONGeometry;
+        properties: ?{};
+        id?: number | string;
+    }
 
     declare export type GeoJSONFeatureCollection = {
         type: 'FeatureCollection',

package.json

@@ -61,7 +61,7 @@
     "eslint-plugin-html": "^7.1.0",
     "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-jsdoc": "^39.6.4",
-    "flow-bin": "0.152.0",
+    "flow-bin": "0.188.0",
     "gl": "6.0.2",
     "glob": "^8.0.3",
     "is-builtin-module": "^3.2.0",

src/data/bucket/circle_bucket.js

@@ -107,6 +107,7 @@ class CircleBucket<Layer: CircleStyleLayer | HeatmapStyleLayer> implements Bucke
             const needGeometry = this.layers[0]._featureFilter.needGeometry;
             const evaluationFeature = toEvaluationFeature(feature, needGeometry);
 
+            // $FlowFixMe[method-unbinding]
             if (!this.layers[0]._featureFilter.filter(new EvaluationParameters(this.zoom), evaluationFeature, canonical)) continue;
 
             const sortKey = circleSortKey ?

src/data/bucket/fill_bucket.js

@@ -89,6 +89,7 @@ class FillBucket implements Bucket {
             const needGeometry = this.layers[0]._featureFilter.needGeometry;
             const evaluationFeature = toEvaluationFeature(feature, needGeometry);
 
+            // $FlowFixMe[method-unbinding]
             if (!this.layers[0]._featureFilter.filter(new EvaluationParameters(this.zoom), evaluationFeature, canonical)) continue;
 
             const sortKey = fillSortKey ?

src/data/bucket/fill_extrusion_bucket.js

@@ -243,6 +243,7 @@ class FillExtrusionBucket implements Bucket {
             const needGeometry = this.layers[0]._featureFilter.needGeometry;
             const evaluationFeature = toEvaluationFeature(feature, needGeometry);
 
+            // $FlowFixMe[method-unbinding]
             if (!this.layers[0]._featureFilter.filter(new EvaluationParameters(this.zoom), evaluationFeature, canonical)) continue;
 
             const bucketFeature: BucketFeature = {

src/data/bucket/line_bucket.js

@@ -146,6 +146,7 @@ class LineBucket implements Bucket {
             const needGeometry = this.layers[0]._featureFilter.needGeometry;
             const evaluationFeature = toEvaluationFeature(feature, needGeometry);
 
+            // $FlowFixMe[method-unbinding]
             if (!this.layers[0]._featureFilter.filter(new EvaluationParameters(this.zoom), evaluationFeature, canonical)) continue;
 
             const sortKey = lineSortKey ?

src/data/bucket/symbol_bucket.js

@@ -506,6 +506,7 @@ class SymbolBucket implements Bucket {
 
             const needGeometry = layer._featureFilter.needGeometry;
             const evaluationFeature = toEvaluationFeature(feature, needGeometry);
+            // $FlowFixMe[method-unbinding]
             if (!layer._featureFilter.filter(globalProperties, evaluationFeature, canonical)) {
                 continue;
             }

src/data/dem_data.js

@@ -23,6 +23,18 @@ const unpackVectors = {
     terrarium: [256.0, 1.0, 1.0 / 256.0, 32768.0]
 };
 
+function unpackMapbox(r: number, g: number, b: number): number {
+    // unpacking formula for mapbox.terrain-rgb:
+    // https://www.mapbox.com/help/access-elevation-data/#mapbox-terrain-rgb
+    return ((r * 256 * 256 + g * 256.0 + b) / 10.0 - 10000.0);
+}
+
+function unpackTerrarium(r: number, g: number, b: number): number {
+    // unpacking formula for mapzen terrarium:
+    // https://aws.amazon.com/public-datasets/terrain/
+    return ((r * 256 + g + b / 256) - 32768.0);
+}
+
 export default class DEMData {
     uid: number;
     pixels: Uint8Array;
@@ -86,7 +98,7 @@ export default class DEMData {
             y = clamp(y, -1, this.dim);
         }
         const index = this._idx(x, y) * 4;
-        const unpack = this.encoding === "terrarium" ? this._unpackTerrarium : this._unpackMapbox;
+        const unpack = this.encoding === "terrarium" ? unpackTerrarium : unpackMapbox;
         return unpack(this.pixels[index], this.pixels[index + 1], this.pixels[index + 2]);
     }
 
@@ -103,18 +115,6 @@ export default class DEMData {
         return (y + 1) * this.stride + (x + 1);
     }
 
-    _unpackMapbox(r: number, g: number, b: number): number {
-        // unpacking formula for mapbox.terrain-rgb:
-        // https://www.mapbox.com/help/access-elevation-data/#mapbox-terrain-rgb
-        return ((r * 256 * 256 + g * 256.0 + b) / 10.0 - 10000.0);
-    }
-
-    _unpackTerrarium(r: number, g: number, b: number): number {
-        // unpacking formula for mapzen terrarium:
-        // https://aws.amazon.com/public-datasets/terrain/
-        return ((r * 256 + g + b / 256) - 32768.0);
-    }
-
     static pack(altitude: number, encoding: DEMEncoding): [number, number, number, number] {
         const color = [0, 0, 0, 0];
         const vector = DEMData.getUnpackVector(encoding);

src/data/feature_index.js

@@ -192,9 +192,11 @@ class FeatureIndex {
 
         if (filter.needGeometry) {
             const evaluationFeature = toEvaluationFeature(feature, true);
+            // $FlowFixMe[method-unbinding]
             if (!filter.filter(new EvaluationParameters(this.tileID.overscaledZ), evaluationFeature, this.tileID.canonical)) {
                 return;
             }
+        // $FlowFixMe[method-unbinding]
         } else if (!filter.filter(new EvaluationParameters(this.tileID.overscaledZ), feature)) {
             return;
         }
@@ -305,8 +307,9 @@ class FeatureIndex {
         let id = feature.id;
         if (this.promoteId) {
             const propName = typeof this.promoteId === 'string' ? this.promoteId : this.promoteId[sourceLayerId];
+            // $FlowFixMe[incompatible-type] - Flow can't narrow the id type from IVectorTileFeature.id
             if (propName != null) id = feature.properties[propName];
-            if (typeof id === 'boolean') id =  Number(id);
+            if (typeof id === 'boolean') id = Number(id);
         }
         return id;
     }

src/data/load_geometry.js

@@ -32,7 +32,7 @@ function preparePoint(point: Point, scale: number) {
 }
 
 // a subset of VectorTileGeometry
-type FeatureWithGeometry = {
+interface FeatureWithGeometry {
     extent: number;
     type: 1 | 2 | 3;
     loadGeometry(): Array<Array<Point>>;

src/data/program_configuration.js

@@ -106,7 +106,9 @@ class ConstantBinder implements UniformBinder {
         uniform.set(program, uniformName, currentValue.constantOr(this.value));
     }
 
+    // $FlowFixMe[method-unbinding]
     getBinding(context: Context, _: string): $Shape<Uniform<any>> {
+        // $FlowFixMe[method-unbinding]
         return (this.type === 'color') ?
             new UniformColor(context) :
             new Uniform1f(context);
@@ -136,7 +138,9 @@ class PatternConstantBinder implements UniformBinder {
         if (pos) uniform.set(program, uniformName, pos);
     }
 
+    // $FlowFixMe[method-unbinding]
     getBinding(context: Context, name: string): $Shape<Uniform<any>> {
+        // $FlowFixMe[method-unbinding]
         return name === 'u_pattern' || name === 'u_dash' ?
             new Uniform4f(context) :
             new Uniform1f(context);
@@ -168,6 +172,7 @@ class SourceExpressionBinder implements AttributeBinder {
     populatePaintArray(newLength: number, feature: Feature, imagePositions: SpritePositions, availableImages: Array<string>, canonical?: CanonicalTileID, formattedSection?: FormattedSection) {
         const start = this.paintVertexArray.length;
         assert(Array.isArray(availableImages));
+        // $FlowFixMe[method-unbinding]
         const value = this.expression.evaluate(new EvaluationParameters(0), feature, {}, canonical, availableImages, formattedSection);
         this.paintVertexArray.resize(newLength);
         this._setPaintValue(start, newLength, value);
@@ -238,7 +243,9 @@ class CompositeExpressionBinder implements AttributeBinder, UniformBinder {
     }
 
     populatePaintArray(newLength: number, feature: Feature, imagePositions: SpritePositions, availableImages: Array<string>, canonical?: CanonicalTileID, formattedSection?: FormattedSection) {
+        // $FlowFixMe[method-unbinding]
         const min = this.expression.evaluate(new EvaluationParameters(this.zoom), feature, {}, canonical, availableImages, formattedSection);
+        // $FlowFixMe[method-unbinding]
         const max = this.expression.evaluate(new EvaluationParameters(this.zoom + 1), feature, {}, canonical, availableImages, formattedSection);
         const start = this.paintVertexArray.length;
         this.paintVertexArray.resize(newLength);
@@ -288,6 +295,7 @@ class CompositeExpressionBinder implements AttributeBinder, UniformBinder {
         uniform.set(program, uniformName, factor);
     }
 
+    // $FlowFixMe[method-unbinding]
     getBinding(context: Context, _: string): Uniform1f {
         return new Uniform1f(context);
     }
@@ -387,7 +395,7 @@ export default class ProgramConfiguration {
             const names = paintAttributeNames(property, layer.type);
             const expression = value.value;
             const type = value.property.specification.type;
-            const useIntegerZoom = value.property.useIntegerZoom;
+            const useIntegerZoom = !!value.property.useIntegerZoom;
             const isPattern = property === 'line-dasharray' || property.endsWith('pattern');
             const sourceException = property === 'line-dasharray' && (layer.layout: any).get('line-cap').value.kind !== 'constant';
 
@@ -400,12 +408,19 @@ export default class ProgramConfiguration {
             } else if (expression.kind === 'source' || sourceException || isPattern) {
                 const StructArrayLayout = layoutType(property, type, 'source');
                 this.binders[property] = isPattern ?
+                    // $FlowFixMe[prop-missing]
+                    // $FlowFixMe[incompatible-call] - expression can be a `composite` or `constant` kind expression
                     new PatternCompositeBinder(expression, names, type, StructArrayLayout, layer.id) :
+                    // $FlowFixMe[prop-missing]
+                    // $FlowFixMe[incompatible-call] - expression can be a `composite` or `constant` kind expression
                     new SourceExpressionBinder(expression, names, type, StructArrayLayout);
+
                 keys.push(`/a_${property}`);
 
             } else {
                 const StructArrayLayout = layoutType(property, type, 'composite');
+                // $FlowFixMe[prop-missing]
+                // $FlowFixMe[incompatible-call] — expression can be a `constant` kind expression
                 this.binders[property] = new CompositeExpressionBinder(expression, names, type, useIntegerZoom, zoom, StructArrayLayout);
                 keys.push(`/z_${property}`);
             }
@@ -660,6 +675,7 @@ const defaultLayouts = {
 
 function layoutType(property, type, binderType) {
     const layoutException = propertyExceptions[property];
+    // $FlowFixMe[prop-missing] - we don't cover all types in defaultLayouts for some reason
     return (layoutException && layoutException[binderType]) || defaultLayouts[type][binderType];
 }
 

src/geo/lng_lat_bounds.js

@@ -97,6 +97,7 @@ class LngLatBounds {
             if (!sw2 || !ne2) return this;
 
         } else if (Array.isArray(obj)) {
+            // $FlowFixMe[method-unbinding]
             if (obj.length === 4 || obj.every(Array.isArray)) {
                 const lngLatBoundsObj = ((obj: any): LngLatBoundsLike);
                 return this.extend(LngLatBounds.convert(lngLatBoundsObj));

src/geo/projection/tile_transform.js

@@ -114,7 +114,7 @@ export function tileAABB(tr: Transform, numTiles: number, z: number, x: number,
         [(wrap  + tx2) * numTiles, numTiles * ty2, max]);
 }
 
-export function getTilePoint(tileTransform: TileTransform, {x, y}: {x: number, y: number}, wrap: number = 0): Point {
+export function getTilePoint(tileTransform: TileTransform, {x, y}: interface { x: number, y: number }, wrap: number = 0): Point {
     return new Point(
         ((x - wrap) * tileTransform.scale - tileTransform.x) * EXTENT,
         (y * tileTransform.scale - tileTransform.y) * EXTENT);

src/geo/transform.js

@@ -81,7 +81,7 @@ class Transform {
     mercatorFogMatrix: Float32Array;
 
     // Projection from world coordinates (mercator scaled by worldSize) to clip coordinates
-    projMatrix: Array<number>;
+    projMatrix: Array<number> | Float32Array | Float64Array;
     invProjMatrix: Float64Array;
 
     // Same as projMatrix, pixel-aligned to avoid fractional pixels for raster tiles
@@ -580,6 +580,7 @@ class Transform {
 
         let changed = false;
         if (options.orientation && !quat.exactEquals(options.orientation, this._camera.orientation)) {
+            // $FlowFixMe[incompatible-call] - Flow can't infer that orientation is not null
             changed = this._setCameraOrientation(options.orientation);
         }
 
@@ -1874,7 +1875,7 @@ class Transform {
         cameraToClip[8] = -offset.x * 2 / this.width;
         cameraToClip[9] = offset.y * 2 / this.height;
 
-        let m = mat4.mul([], cameraToClip, worldToCamera);
+        let m: Array<number> | Float32Array | Float64Array = mat4.mul([], cameraToClip, worldToCamera);
 
         if (this.projection.isReprojectedInTileSpace) {
             // Projections undistort as you zoom in (shear, scale, rotate).

src/render/draw_fill_extrusion.js

@@ -145,7 +145,7 @@ function drawExtrusionTiles(painter, source, layer, coords, depthMode, stencilMo
 function flatRoofsUpdate(context, source, coord, bucket, layer, terrain) {
     // For all four borders: 0 - left, 1, right, 2 - top, 3 - bottom
     const neighborCoord = [
-        coord => {
+        (coord: OverscaledTileID) => {
             let x = coord.canonical.x - 1;
             let w = coord.wrap;
             if (x < 0) {
@@ -154,7 +154,7 @@ function flatRoofsUpdate(context, source, coord, bucket, layer, terrain) {
             }
             return new OverscaledTileID(coord.overscaledZ, w, coord.canonical.z, x, coord.canonical.y);
         },
-        coord => {
+        (coord: OverscaledTileID) => {
             let x = coord.canonical.x + 1;
             let w = coord.wrap;
             if (x === 1 << coord.canonical.z) {

src/render/draw_symbol.js

@@ -295,7 +295,7 @@ function drawLayerSymbols(painter, sourceCache, layer, coords, isText, translate
 
     const mercatorCameraUp = [0, -1, 0];
 
-    let globeCameraUp = mercatorCameraUp;
+    let globeCameraUp: [number, number, number] = mercatorCameraUp;
     if ((isGlobeProjection || tr.mercatorFromTransition) && !rotateWithMap) {
         // Each symbol rotating with the viewport requires per-instance information about
         // how to align with the viewport. In 2D case rotation is shared between all of the symbols and

src/render/image_manager.js

@@ -252,6 +252,7 @@ class ImageManager extends Evented {
             this.dirty = false;
         }
 
+        if (!this.atlasTexture) return; // Flow can't infer that atlasTexture is defined here
         this.atlasTexture.bind(gl.LINEAR, gl.CLAMP_TO_EDGE);
     }
 

src/render/painter.js

@@ -555,6 +555,7 @@ class Painter {
         // With terrain on, renders the depth buffer into a texture.
         // This texture is used for occlusion testing (labels)
         if (this.terrain && (this.style.hasSymbolLayers() || this.style.hasCircleLayers())) {
+            // $FlowFixMe[incompatible-use] - Flow can't infer that terrain is not null
             this.terrain.drawDepth();
         }