Fix internal TypeScript types (internal-8355)

GitOrigin-RevId: 40007eba3ee2246881177de4920b880c48920228

Author: stepankuzmin

src/source/load_vector_tile.ts

@@ -4,13 +4,12 @@ import {getArrayBuffer} from '../util/ajax';
 
 import type {Callback} from '../types/callback';
 import type {WorkerSourceVectorTileRequest} from './worker_source';
-import type Scheduler from '../util/scheduler';
+import type {default as Scheduler, TaskMetadata} from '../util/scheduler';
 
 export type LoadVectorTileResult = {
     rawData: ArrayBuffer;
     vectorTile?: VectorTile;
-    resourceTiming?: Array<PerformanceResourceTiming>;
-    responseHeaders?: Map<string, string>
+    responseHeaders?: Map<string, string>;
 };
 
 /**
@@ -21,61 +20,52 @@ export type LoadVectorTileResult = {
  */
 export type LoadVectorDataCallback = Callback<LoadVectorTileResult | null | undefined>;
 
-export type AbortVectorData = () => void;
-export type LoadVectorData = (params: WorkerSourceVectorTileRequest, callback: LoadVectorDataCallback) => AbortVectorData | undefined;
+export type LoadVectorData = (params: WorkerSourceVectorTileRequest, callback: LoadVectorDataCallback) => AbortVectorDataRequest | undefined;
+
+type VectorDataRequest = (callback: LoadVectorDataCallback) => AbortVectorDataRequest;
+type AbortVectorDataRequest = () => void;
+
+type DedupedRequestEntry = {
+    result?: [Error | null, LoadVectorTileResult];
+    cancel?: AbortVectorDataRequest;
+    callbacks?: LoadVectorDataCallback[];
+};
+
 export class DedupedRequest {
-    entries: {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        [key: string]: any;
-    };
-    scheduler: Scheduler | null | undefined;
+    scheduler?: Scheduler;
+    entries: {[key: string]: DedupedRequestEntry;};
 
     constructor(scheduler?: Scheduler) {
         this.entries = {};
         this.scheduler = scheduler;
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    request(key: string, metadata: any, request: any, callback: LoadVectorDataCallback): () => void {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+    request(key: string, metadata: TaskMetadata, request: VectorDataRequest, callback: LoadVectorDataCallback): AbortVectorDataRequest {
         const entry = this.entries[key] = this.entries[key] || {callbacks: []};
 
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         if (entry.result) {
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
             const [err, result] = entry.result;
             if (this.scheduler) {
                 this.scheduler.add(() => {
-                    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
                     callback(err, result);
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
                 }, metadata);
             } else {
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
                 callback(err, result);
             }
             return () => {};
         }
 
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
         entry.callbacks.push(callback);
 
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         if (!entry.cancel) {
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
-            entry.cancel = request((err, result) => {
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+            entry.cancel = request((err: Error, result: LoadVectorTileResult) => {
                 entry.result = [err, result];
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
                 for (const cb of entry.callbacks) {
                     if (this.scheduler) {
                         this.scheduler.add(() => {
-                            // eslint-disable-next-line @typescript-eslint/no-unsafe-call
                             cb(err, result);
-                        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
                         }, metadata);
                     } else {
-                        // eslint-disable-next-line @typescript-eslint/no-unsafe-call
                         cb(err, result);
                     }
                 }
@@ -84,13 +74,9 @@ export class DedupedRequest {
         }
 
         return () => {
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
             if (entry.result) return;
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
             entry.callbacks = entry.callbacks.filter(cb => cb !== callback);
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
             if (!entry.callbacks.length) {
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
                 entry.cancel();
                 delete this.entries[key];
             }
@@ -102,20 +88,21 @@ export class DedupedRequest {
  * @private
  */
 export function loadVectorTile(
+    this: {deduped: DedupedRequest},
     params: WorkerSourceVectorTileRequest,
     callback: LoadVectorDataCallback,
     skipParse?: boolean,
-): () => void {
+): AbortVectorDataRequest {
     const key = JSON.stringify(params.request);
 
-    const makeRequest = (callback: LoadVectorDataCallback) => {
+    const makeRequest: VectorDataRequest = (callback: LoadVectorDataCallback) => {
         const request = getArrayBuffer(params.request, (err?: Error | null, data?: ArrayBuffer | null, responseHeaders?: Headers) => {
             if (err) {
                 callback(err);
             } else if (data) {
                 callback(null, {
-                    vectorTile: skipParse ? undefined : new VectorTile(new Protobuf(data)),
                     rawData: data,
+                    vectorTile: skipParse ? undefined : new VectorTile(new Protobuf(data)),
                     responseHeaders: new Map(responseHeaders.entries())
                 });
             }
@@ -128,11 +115,9 @@ export function loadVectorTile(
 
     if (params.data) {
         // if we already got the result earlier (on the main thread), return it directly
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-        (this.deduped as DedupedRequest).entries[key] = {result: [null, params.data]};
+        this.deduped.entries[key] = {result: [null, params.data]};
     }
 
-    const callbackMetadata = {type: 'parseTile', isSymbolTile: params.isSymbolTile, zoom: params.tileZoom};
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-    return (this.deduped as DedupedRequest).request(key, callbackMetadata, makeRequest, callback);
+    const callbackMetadata: TaskMetadata = {type: 'parseTile', isSymbolTile: params.isSymbolTile, zoom: params.tileZoom};
+    return this.deduped.request(key, callbackMetadata, makeRequest, callback);
 }

src/source/vector_tile_source.ts

@@ -300,9 +300,9 @@ class VectorTileSource extends Evented<SourceEvents> implements ISource<'vector'
                         const expiryData = getExpiryDataFromHeaders(data.responseHeaders);
                         // the worker will skip the network request if the data is already there
                         params.data = {
-                            cacheControl: expiryData.cacheControl,
+                            rawData: data.rawData.slice(0),
                             expires: expiryData.expires,
-                            rawData: data.rawData.slice(0)
+                            cacheControl: expiryData.cacheControl,
                         };
                         // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
                         if (tile.actor) tile.actor.send('loadTile', params, done.bind(this), undefined, true);

src/source/worker_source.ts

@@ -66,7 +66,11 @@ export type WorkerSourceVectorTileRequest = WorkerSourceTileRequest & {
     tileSize: number;
     tileZoom: number;
     zoom: number;
-    data?: unknown;
+    data?: {
+        rawData: ArrayBuffer;
+        expires?: string;
+        cacheControl?: string;
+    };
     extraShadowCaster?: boolean;
     isSymbolTile?: boolean | null;
     partial?: boolean;