Minor TypeScript improvements

GitOrigin-RevId: aa899f3c53b24ac0b85ba5eadc9ed01a3d617784

Author: stepankuzmin

src/data/mrt/mrt.query.ts

@@ -40,13 +40,11 @@ export function getPointXY([x, y]: [number, number], bandView: TBandViewRGBA, {s
         return null;
     }
 
-    let output: unknown[] = [];
+    let output: ArrayLike<number> & {[index: number]: number} = [];
     if (scaled) {
         output = [];
     } else {
-        const Ctor = bandView.data.constructor;
-        // @ts-expect-error This expression is not constructable.
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call
+        const Ctor = bandView.data.constructor as new (size: number) => typeof bandView.data;
         output = new Ctor(dimension);
     }
 

src/geo/projection/globe_util.ts

@@ -767,7 +767,7 @@ export class GlobeSharedBuffers {
 
         // Index adjustment, used to make strip (x, y) vertex input attribute data
         // to match same data on ordinary grid edges
-        const prepareVertex = (x: number, y: number, isSkirt: boolean) => {
+        const prepareVertex = (x: number, y: number, isSkirt: boolean): [number, number] => {
             if (!EMBED_SKIRTS) return [x, y];
 
             let adjustedX = (() => {
@@ -790,7 +790,6 @@ export class GlobeSharedBuffers {
         // Add first horizontal strip if present
         if (EMBED_SKIRTS) {
             for (let x = 0; x < xVertices; ++x) {
-                // @ts-expect-error - TS2556 - A spread argument must either have a tuple type or be passed to a rest parameter.
                 vertices.emplaceBack(...prepareVertex(x, 0, true));
             }
         }
@@ -800,7 +799,6 @@ export class GlobeSharedBuffers {
             for (let x = 0; x < xVertices; ++x) {
                 const isSideBorder = (x === 0 || x === xVertices - 1);
 
-                // @ts-expect-error - TS2556 - A spread argument must either have a tuple type or be passed to a rest parameter.
                 vertices.emplaceBack(...prepareVertex(x, y, isSideBorder && EMBED_SKIRTS));
             }
         }
@@ -810,7 +808,6 @@ export class GlobeSharedBuffers {
             for (let lodIdx = 0; lodIdx < latitudinalLods.length; ++lodIdx) {
                 const lastYRowForLod = latitudinalLods[lodIdx];
                 for (let x = 0; x < xVertices; ++x) {
-                    // @ts-expect-error - TS2556 - A spread argument must either have a tuple type or be passed to a rest parameter.
                     vertices.emplaceBack(...prepareVertex(x, lastYRowForLod, true));
                 }
             }

src/render/draw_raster_particle.ts

@@ -555,8 +555,7 @@ export function prepare(layer: RasterParticleStyleLayer, sourceCache: SourceCach
     const band = layer.paint.get('raster-particle-array-band') || source.getInitialBand(sourceLayer);
     if (band == null) return;
 
-    // @ts-expect-error - TS2322 - Type 'Tile[]' is not assignable to type 'RasterArrayTile[]'.
-    const tiles: Array<RasterArrayTile> = sourceCache.getIds().map(id => sourceCache.getTileByID(id));
+    const tiles = sourceCache.getIds().map(id => sourceCache.getTileByID(id) as RasterArrayTile);
     for (const tile of tiles) {
         if (tile.updateNeeded(layer.id, band)) {
             source.prepareTile(tile, sourceLayer, layer.id, band);

src/render/glyph_manager.ts

@@ -51,7 +51,7 @@ type Entry = {
     glyphs: StyleGlyphs;
     requests: {[range: number]: Array<Callback<GlyphRange>>};
     ranges: {[range: number]: boolean | null};
-    tinySDF?: TinySDF;
+    tinySDF?: TinySDF & {fontWeight: FontWeight};
     ascender?: number;
     descender?: number;
 };
@@ -225,7 +225,7 @@ class GlyphManager {
 
         let tinySDF = entry.tinySDF;
         if (!tinySDF) {
-            let fontWeight = '400';
+            let fontWeight: FontWeight = '400';
             if (/bold/i.test(stack)) {
                 fontWeight = '900';
             } else if (/medium/i.test(stack)) {
@@ -237,17 +237,15 @@ class GlyphManager {
             const fontSize = 24 * SDF_SCALE;
             const buffer = 3 * SDF_SCALE;
             const radius = 8 * SDF_SCALE;
-            tinySDF = entry.tinySDF = new GlyphManager.TinySDF({fontFamily, fontWeight, fontSize, buffer, radius});
-            // @ts-expect-error - TS2339 - Property 'fontWeight' does not exist on type 'TinySDF'.
+            tinySDF = entry.tinySDF = new GlyphManager.TinySDF({fontFamily, fontWeight, fontSize, buffer, radius}) as Entry['tinySDF'];
             tinySDF.fontWeight = fontWeight;
         }
 
-        // @ts-expect-error - TS2339 - Property 'fontWeight' does not exist on type 'TinySDF'.
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-        if (this.localGlyphs[tinySDF.fontWeight][id]) {
-            // @ts-expect-error - TS2339 - Property 'fontWeight' does not exist on type 'TinySDF'.
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access
-            return this.localGlyphs[tinySDF.fontWeight][id];
+        const weight = tinySDF.fontWeight;
+
+        if (this.localGlyphs[weight][id]) {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+            return this.localGlyphs[weight][id];
         }
 
         const char = String.fromCodePoint(id);
@@ -271,9 +269,7 @@ class GlyphManager {
         */
         const baselineAdjustment = 27;
 
-        // @ts-expect-error - TS2339 - Property 'fontWeight' does not exist on type 'TinySDF'.
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-        const glyph = this.localGlyphs[tinySDF.fontWeight][id] = {
+        const glyph = this.localGlyphs[weight][id] = {
             id,
             bitmap: new AlphaImage({width, height}, data),
             metrics: {

src/source/custom_source.ts

@@ -212,14 +212,14 @@ class CustomSource<T> extends Evented<SourceEvents> implements ISource {
             this.tileBounds = new TileBounds(this._implementation.bounds, this.minzoom, this.maxzoom);
         }
 
-        // @ts-expect-error - TS2339 - Property 'update' does not exist on type 'CustomSourceInterface<T>'.
-        implementation.update = this._update.bind(this);
-
-        // @ts-expect-error - TS2339 - Property 'clearTiles' does not exist on type 'CustomSourceInterface<T>'.
-        implementation.clearTiles = this._clearTiles.bind(this);
-
-        // @ts-expect-error - TS2339 - Property 'coveringTiles' does not exist on type 'CustomSourceInterface<T>'.
-        implementation.coveringTiles = this._coveringTiles.bind(this);
+        const impl = implementation as CustomSourceInterface<T> & {
+            update: () => void;
+            clearTiles: () => void;
+            coveringTiles: () => {z: number; x: number; y: number}[];
+        };
+        impl.update = this._update.bind(this);
+        impl.clearTiles = this._clearTiles.bind(this);
+        impl.coveringTiles = this._coveringTiles.bind(this);
 
         Object.assign(this, pick(implementation, ['dataType', 'scheme', 'minzoom', 'maxzoom', 'tileSize', 'attribution', 'minTileCacheSize', 'maxTileCacheSize']));
     }

src/source/geojson_wrapper.ts

@@ -47,10 +47,8 @@ class FeatureWrapper implements VectorTileFeature {
         // vector tile spec only supports integer values for feature ids --
         // allowing non-integer values here results in a non-compliant PBF
         // that causes an exception when it is parsed with vector-tile-js
-        // @ts-expect-error - TS2345 - Argument of type 'unknown' is not assignable to parameter of type 'number'.
-        if ('id' in feature && !isNaN(feature.id)) {
-            // @ts-expect-error - TS2345 - Argument of type 'unknown' is not assignable to parameter of type 'string'.
-            this.id = parseInt(feature.id, 10);
+        if ('id' in feature && !isNaN(feature.id as number)) {
+            this.id = parseInt(feature.id as string, 10);
         }
     }
 

src/source/rtl_text_plugin.ts

@@ -30,10 +30,8 @@ let _completionCallback = null;
 let pluginStatus: PluginStatus = rtlPluginStatus.unavailable;
 let pluginURL: string | null | undefined = null;
 
-export const triggerPluginCompletionEvent = function (error?: Error | null) {
+export const triggerPluginCompletionEvent = function (error?: Error | string | null) {
     // NetworkError's are not correctly reflected by the plugin status which prevents reloading plugin
-// @ts-expect-error - TS2339 - Property 'indexOf' does not exist on type 'never'.
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-call
     if (error && typeof error === 'string' && error.indexOf('NetworkError') > -1) {
         pluginStatus = rtlPluginStatus.error;
     }

src/source/source_cache.ts

@@ -906,11 +906,11 @@ class SourceCache extends Evented {
 
         const expiryTimeout = tile.getExpiryTimeout();
         if (expiryTimeout) {
-            // @ts-expect-error - TS2322 - Type 'Timeout' is not assignable to type 'number'.
+            // Browser setTimeout returns number; cast needed because TS sees Node's Timeout type
             this._timers[id] = setTimeout(() => {
                 this._reloadTile(id, 'expired');
                 delete this._timers[id];
-            }, expiryTimeout);
+            }, expiryTimeout) as unknown as number;
         }
     }
 
@@ -934,8 +934,7 @@ class SourceCache extends Evented {
             return;
 
         if ((tile.hasData() && tile.state !== 'reloading') || tile.state === 'empty') {
-            // @ts-expect-error - TS2345 - Argument of type 'number | void' is not assignable to parameter of type 'number'.
-            this._cache.add(tile.tileID, tile, tile.getExpiryTimeout());
+            this._cache.add(tile.tileID, tile, tile.getExpiryTimeout() as number | undefined);
         } else {
             tile.aborted = true;
             this._abortTile(tile);

src/source/tile.ts

@@ -74,7 +74,7 @@ export type ExpiryData = {
 // a tile bounds outline used for getting reprojected tile geometry in non-mercator projections
 const BOUNDS_FEATURE = (() => {
     return {
-        type: 2,
+        type: 2 as const,
         extent: EXTENT,
         loadGeometry() {
             return [[
@@ -903,7 +903,6 @@ class Tile {
         if (!projection || projection.name === 'mercator' || this._tileDebugBuffer) return;
 
         // reproject tile outline with adaptive resampling
-        // @ts-expect-error - TS2345 - Argument of type '{ type: number; extent: number; loadGeometry(): Point[][]; }' is not assignable to parameter of type 'FeatureWithGeometry'.
         const boundsLine = loadGeometry(BOUNDS_FEATURE, this.tileID.canonical, this.tileTransform)[0];
 
         // generate vertices for debugging tile boundaries
@@ -926,7 +925,6 @@ class Tile {
         if (this._tileBoundsBuffer || !projection || projection.name === 'mercator') return;
 
         // reproject tile outline with adaptive resampling
-        // @ts-expect-error - TS2345 - Argument of type '{ type: number; extent: number; loadGeometry(): Point[][]; }' is not assignable to parameter of type 'FeatureWithGeometry'.
         const boundsLine = loadGeometry(BOUNDS_FEATURE, this.tileID.canonical, this.tileTransform)[0];
 
         let boundsVertices, boundsIndices;

src/style-spec/expression/compound_expression.ts

@@ -67,7 +67,7 @@ class CompoundExpression implements Expression {
         const type = Array.isArray(definition) ?
             definition[0] : definition.type;
 
-        const availableOverloads = Array.isArray(definition) ?
+        const availableOverloads: Array<[Signature, Evaluate]> = Array.isArray(definition) ?
             [[definition[1], definition[2]]] :
             definition.overloads;
 
@@ -93,13 +93,10 @@ class CompoundExpression implements Expression {
             let argParseFailed = false;
             for (let i = 1; i < args.length; i++) {
                 const arg = args[i];
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
                 const expectedType = Array.isArray(params) ?
                     params[i - 1] :
-                // @ts-expect-error - TS2339 - Property 'type' does not exist on type 'Varargs | Evaluate'.
                     params.type;
 
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
                 const parsed = signatureContext.parse(arg, 1 + parsedArgs.length, expectedType);
                 if (!parsed) {
                     argParseFailed = true;
@@ -121,16 +118,12 @@ class CompoundExpression implements Expression {
             }
 
             for (let i = 0; i < parsedArgs.length; i++) {
-                // @ts-expect-error - TS2339 - Property 'type' does not exist on type 'Varargs | Evaluate'.
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
                 const expected = Array.isArray(params) ? params[i] : params.type;
                 const arg = parsedArgs[i];
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
                 signatureContext.concat(i + 1).checkSubtype(expected, arg.type);
             }
 
             if (signatureContext.errors.length === 0) {
-                // @ts-expect-error - TS2345 - Argument of type 'Signature | Evaluate' is not assignable to parameter of type 'Evaluate'.
                 return new CompoundExpression(op, type, evaluate, parsedArgs, overloadIndex);
             }
         }