Upgrade Flow to v0.85 and remove flow-coverage-report (mapbox#7565)

* upgrade flow to v0.85

* fix lint

* remove flow-coverage-report

It was broken anyway, upgrading doesn't help, and we haven't really used it.

.flowconfig

@@ -17,4 +17,4 @@
 .*/_site/.*
 
 [version]
-0.77.0
+0.85.0

bench/benchmarks/worker_transfer.js

@@ -54,7 +54,7 @@ export default class WorkerTransfer extends Benchmark {
             });
     }
 
-    sendPayload(obj: any) {
+    sendPayload(obj: any): Promise<void> {
         return new Promise((resolve) => {
             this.worker.onmessage = () => resolve();
             this.worker.postMessage(obj);

package.json

@@ -57,8 +57,7 @@
     "eslint-plugin-import": "^2.14.0",
     "eslint-plugin-react": "^7.11.1",
     "execcommand-copy": "^1.1.0",
-    "flow-bin": "^0.77.0",
-    "flow-coverage-report": "^0.3.0",
+    "flow-bin": "^0.85.0",
     "github-slugger": "^1.1.1",
     "gl": "^4.1.1",
     "glob": "^7.0.3",
@@ -140,7 +139,6 @@
     "test-query": "node test/query.test.js",
     "test-expressions": "build/run-node test/expression.test.js",
     "test-flow": "build/run-node build/generate-flow-typed-style-spec && flow .",
-    "test-flow-cov": "flow-coverage-report -i 'src/**/*.js' -t html",
     "test-cov": "nyc --require=@mapbox/flow-remove-types/register --reporter=text-summary --reporter=lcov --cache run-s test-unit test-expressions test-query test-render",
     "prepublishOnly": "run-s build-flow-types build-dev build-prod-min build-prod build-css build-style-spec test-build",
     "codegen": "build/run-node build/generate-style-code.js && build/run-node build/generate-struct-arrays.js"

src/geo/transform.js

@@ -7,10 +7,12 @@ import Point from '@mapbox/point-geometry';
 import { wrap, clamp } from '../util/util';
 import {number as interpolate} from '../style-spec/util/interpolate';
 import tileCover from '../util/tile_cover';
-import { CanonicalTileID, UnwrappedTileID } from '../source/tile_id';
+import { UnwrappedTileID } from '../source/tile_id';
 import EXTENT from '../data/extent';
 import { vec4, mat4, mat2 } from 'gl-matrix';
 
+import type { OverscaledTileID, CanonicalTileID } from '../source/tile_id';
+
 /**
  * A single transform, generally used for a single tile to be
  * scaled, rotated, and zoomed.
@@ -244,7 +246,7 @@ class Transform {
             reparseOverscaled?: boolean,
             renderWorldCopies?: boolean
         }
-    ) {
+    ): Array<OverscaledTileID> {
         let z = this.coveringZoomLevel(options);
         const actualZ = z;
 

src/style-spec/expression/index.js

@@ -17,7 +17,7 @@ import RuntimeError from './runtime_error';
 import { success, error } from '../util/result';
 import { supportsPropertyExpression, supportsZoomExpression, supportsInterpolation } from '../util/properties';
 
-import type {Type} from './types';
+import type {Type, EvaluationKind} from './types';
 import type {Value} from './values';
 import type {Expression} from './expression';
 import type {StylePropertySpecification} from '../style-spec';
@@ -120,15 +120,15 @@ export function createExpression(expression: mixed, propertySpec: StylePropertyS
     return success(new StyleExpression(parsed, propertySpec));
 }
 
-export class ZoomConstantExpression<Kind> {
+export class ZoomConstantExpression<Kind: EvaluationKind> {
     kind: Kind;
     isStateDependent: boolean;
     _styleExpression: StyleExpression;
 
     constructor(kind: Kind, expression: StyleExpression) {
         this.kind = kind;
         this._styleExpression = expression;
-        this.isStateDependent = kind !== 'constant' && !isConstant.isStateConstant(expression.expression);
+        this.isStateDependent = kind !== ('constant': EvaluationKind) && !isConstant.isStateConstant(expression.expression);
     }
 
     evaluateWithoutErrorHandling(globals: GlobalProperties, feature?: Feature, featureState?: FeatureState): any {
@@ -140,7 +140,7 @@ export class ZoomConstantExpression<Kind> {
     }
 }
 
-export class ZoomDependentExpression<Kind> {
+export class ZoomDependentExpression<Kind: EvaluationKind> {
     kind: Kind;
     zoomStops: Array<number>;
     isStateDependent: boolean;
@@ -152,7 +152,7 @@ export class ZoomDependentExpression<Kind> {
         this.kind = kind;
         this.zoomStops = zoomCurve.labels;
         this._styleExpression = expression;
-        this.isStateDependent = kind !== 'camera' && !isConstant.isStateConstant(expression.expression);
+        this.isStateDependent = kind !== ('camera': EvaluationKind) && !isConstant.isStateConstant(expression.expression);
         if (zoomCurve instanceof Interpolate) {
             this._interpolationType = zoomCurve.interpolation;
         }
@@ -254,7 +254,7 @@ export class StylePropertyFunction<T> {
     _parameters: PropertyValueSpecification<T>;
     _specification: StylePropertySpecification;
 
-    kind: 'constant' | 'source' | 'camera' | 'composite';
+    kind: EvaluationKind;
     evaluate: (globals: GlobalProperties, feature?: Feature) => any;
     interpolationFactor: ?(input: number, lower: number, upper: number) => number;
     zoomStops: ?Array<number>;

src/style-spec/expression/types.js

@@ -11,6 +11,8 @@ export type ErrorTypeT = { kind: 'error' };
 export type CollatorTypeT = { kind: 'collator' };
 export type FormattedTypeT = { kind: 'formatted' };
 
+export type EvaluationKind = 'constant' | 'source' | 'camera' | 'composite';
+
 export type Type =
     NullTypeT |
     NumberTypeT |

src/style-spec/validate/validate_expression.js

@@ -6,7 +6,7 @@ import { createExpression, createPropertyExpression } from '../expression';
 import { deepUnbundle } from '../util/unbundle_jsonlint';
 import { isStateConstant } from '../expression/is_constant';
 
-export default function validateExpression(options: any) {
+export default function validateExpression(options: any): Array<ValidationError> {
     const expression = (options.expressionContext === 'property' ? createPropertyExpression : createExpression)(deepUnbundle(options.value), options.valueSpec);
     if (expression.result === 'error') {
         return expression.value.map((error) => {

src/symbol/placement.js

@@ -132,6 +132,7 @@ export class Placement {
         this.placements = {};
         this.opacities = {};
         this.stale = false;
+        this.commitTime = 0;
         this.fadeDuration = fadeDuration;
         this.retainedQueryData = {};
         this.collisionGroups = new CollisionGroups(crossSourceCollisions);
@@ -501,8 +502,7 @@ export class Placement {
     }
 
     stillRecent(now: number) {
-        return this.commitTime !== 'undefined' &&
-            this.commitTime + this.fadeDuration > now;
+        return this.commitTime + this.fadeDuration > now;
     }
 
     setStale() {