Only import types where possible, and add consistent-type-imports rule (

#5099)

build/rollup_plugins.ts

@@ -5,7 +5,7 @@ import replace from '@rollup/plugin-replace';
 import commonjs from '@rollup/plugin-commonjs';
 import terser from '@rollup/plugin-terser';
 import strip from '@rollup/plugin-strip';
-import {Plugin} from 'rollup';
+import {type Plugin} from 'rollup';
 import json from '@rollup/plugin-json';
 
 // Common set of plugins/transformations shared across different rollup

eslint.config.js

@@ -43,7 +43,9 @@ export default [
         rules: {
             'no-dupe-class-members': 'off',
             '@typescript-eslint/no-dupe-class-members': ['error'],
-
+            '@typescript-eslint/consistent-type-imports': ['error',{
+                'fixStyle': 'inline-type-imports'
+            }],
             '@typescript-eslint/no-unused-vars': ['warn', {
                 argsIgnorePattern: '^_',
             }],
@@ -153,5 +155,5 @@ export default [
             },
         },
     },
-    
-];
+
+];

rollup.config.csp.ts

@@ -1,6 +1,6 @@
 import {plugins} from './build/rollup_plugins';
 import banner from './build/banner';
-import {InputOption, ModuleFormat, RollupOptions} from 'rollup';
+import {type InputOption, type ModuleFormat, type RollupOptions} from 'rollup';
 
 // a config for generating a special GL JS bundle with static web worker code (in a separate file)
 // https://github.com/mapbox/mapbox-gl-js/issues/6058

rollup.config.ts

@@ -2,7 +2,7 @@ import fs from 'fs';
 import sourcemaps from 'rollup-plugin-sourcemaps2';
 import {plugins, watchStagingPlugin} from './build/rollup_plugins';
 import banner from './build/banner';
-import {RollupOptions} from 'rollup';
+import {type RollupOptions} from 'rollup';
 
 const {BUILD} = process.env;
 

src/data/bucket.ts

@@ -7,7 +7,7 @@ import type {FeatureStates} from '../source/source_state';
 import type {ImagePosition} from '../render/image_atlas';
 import type {CanonicalTileID} from '../source/tile_id';
 import type {VectorTileFeature, VectorTileLayer} from '@mapbox/vector-tile';
-import Point from '@mapbox/point-geometry';
+import type Point from '@mapbox/point-geometry';
 import type {SubdivisionGranularitySetting} from '../render/subdivision_granularity_settings';
 
 export type BucketParameters<Layer extends TypedStyleLayer> = {

src/data/bucket/circle_bucket.ts

@@ -27,7 +27,7 @@ import type Point from '@mapbox/point-geometry';
 import type {FeatureStates} from '../../source/source_state';
 import type {ImagePosition} from '../../render/image_atlas';
 import type {VectorTileLayer} from '@mapbox/vector-tile';
-import {CircleGranularity} from '../../render/subdivision_granularity_settings';
+import {type CircleGranularity} from '../../render/subdivision_granularity_settings';
 
 const VERTEX_MIN_VALUE = -32768; // -(2^15)
 

src/data/bucket/fill_bucket.test.ts

@@ -7,10 +7,10 @@ import Point from '@mapbox/point-geometry';
 import {SegmentVector} from '../segment';
 import {FillBucket} from './fill_bucket';
 import {FillStyleLayer} from '../../style/style_layer/fill_style_layer';
-import {LayerSpecification} from '@maplibre/maplibre-gl-style-spec';
-import {EvaluationParameters} from '../../style/evaluation_parameters';
-import {ZoomHistory} from '../../style/zoom_history';
-import {BucketFeature, BucketParameters} from '../bucket';
+import {type LayerSpecification} from '@maplibre/maplibre-gl-style-spec';
+import {type EvaluationParameters} from '../../style/evaluation_parameters';
+import {type ZoomHistory} from '../../style/zoom_history';
+import {type BucketFeature, type BucketParameters} from '../bucket';
 import {SubdivisionGranularitySetting} from '../../render/subdivision_granularity_settings';
 import {CanonicalTileID} from '../../source/tile_id';
 

src/data/bucket/fill_extrusion_bucket.ts

@@ -1,7 +1,7 @@
 import {FillExtrusionLayoutArray, PosArray} from '../array_types.g';
 
 import {members as layoutAttributes, centroidAttributes} from './fill_extrusion_attributes';
-import {Segment, SegmentVector} from '../segment';
+import {type Segment, SegmentVector} from '../segment';
 import {ProgramConfigurationSet} from '../program_configuration';
 import {TriangleIndexArray} from '../index_array_type';
 import {EXTENT} from '../extent';

src/data/bucket/line_bucket.test.ts

@@ -6,9 +6,9 @@ import Point from '@mapbox/point-geometry';
 import {SegmentVector} from '../segment';
 import {LineBucket} from './line_bucket';
 import {LineStyleLayer} from '../../style/style_layer/line_style_layer';
-import {LayerSpecification} from '@maplibre/maplibre-gl-style-spec';
-import {EvaluationParameters} from '../../style/evaluation_parameters';
-import {BucketFeature, BucketParameters} from '../bucket';
+import {type LayerSpecification} from '@maplibre/maplibre-gl-style-spec';
+import {type EvaluationParameters} from '../../style/evaluation_parameters';
+import {type BucketFeature, type BucketParameters} from '../bucket';
 import {SubdivisionGranularitySetting} from '../../render/subdivision_granularity_settings';
 
 const noSubdivision = SubdivisionGranularitySetting.noSubdivision;

src/data/bucket/line_bucket.ts

@@ -25,7 +25,7 @@ import type {
 import type {LineStyleLayer} from '../../style/style_layer/line_style_layer';
 import type Point from '@mapbox/point-geometry';
 import type {Segment} from '../segment';
-import {RGBAImage} from '../../util/image';
+import {type RGBAImage} from '../../util/image';
 import type {Context} from '../../gl/context';
 import type {Texture} from '../../render/texture';
 import type {IndexBuffer} from '../../gl/index_buffer';

src/data/bucket/pattern_bucket_features.ts

@@ -6,7 +6,7 @@ import type {
     BucketFeature,
     PopulateParameters
 } from '../bucket';
-import {PossiblyEvaluated} from '../../style/properties';
+import {type PossiblyEvaluated} from '../../style/properties';
 
 type PatternStyleLayers = Array<LineStyleLayer> | Array<FillStyleLayer> | Array<FillExtrusionStyleLayer>;
 

src/data/bucket/symbol_bucket.test.ts

@@ -6,17 +6,17 @@ import {SymbolBucket} from './symbol_bucket';
 import {CollisionBoxArray} from '../../data/array_types.g';
 import {performSymbolLayout} from '../../symbol/symbol_layout';
 import {Placement} from '../../symbol/placement';
-import {CanonicalTileID, OverscaledTileID} from '../../source/tile_id';
+import {type CanonicalTileID, OverscaledTileID} from '../../source/tile_id';
 import {Tile} from '../../source/tile';
 import {CrossTileSymbolIndex} from '../../symbol/cross_tile_symbol_index';
 import {FeatureIndex} from '../../data/feature_index';
 import {createSymbolBucket, createSymbolIconBucket} from '../../../test/unit/lib/create_symbol_layer';
 import {RGBAImage} from '../../util/image';
 import {ImagePosition} from '../../render/image_atlas';
-import {IndexedFeature, PopulateParameters} from '../bucket';
-import {StyleImage} from '../../style/style_image';
+import {type IndexedFeature, type PopulateParameters} from '../bucket';
+import {type StyleImage} from '../../style/style_image';
 import glyphs from '../../../test/unit/assets/fontstack-glyphs.json' with {type: 'json'};
-import {StyleGlyph} from '../../style/style_glyph';
+import {type StyleGlyph} from '../../style/style_glyph';
 import {SubdivisionGranularitySetting} from '../../render/subdivision_granularity_settings';
 import {MercatorTransform} from '../../geo/projection/mercator_transform';
 

src/data/bucket/symbol_bucket.ts

@@ -30,7 +30,7 @@ import {toEvaluationFeature} from '../evaluation_feature';
 import mvt from '@mapbox/vector-tile';
 const vectorTileFeatureTypes = mvt.VectorTileFeature.types;
 import {verticalizedCharacterMap} from '../../util/verticalize_punctuation';
-import {Anchor} from '../../symbol/anchor';
+import {type Anchor} from '../../symbol/anchor';
 import {getSizeData, MAX_PACKED_SIZE} from '../../symbol/symbol_size';
 
 import {register} from '../../util/web_worker_transfer';

src/data/feature_index.ts

@@ -1,4 +1,4 @@
-import Point from '@mapbox/point-geometry';
+import type Point from '@mapbox/point-geometry';
 import {loadGeometry} from './load_geometry';
 import {toEvaluationFeature} from './evaluation_feature';
 import {EXTENT} from './extent';
@@ -10,14 +10,14 @@ import Protobuf from 'pbf';
 import {GeoJSONFeature} from '../util/vectortile_to_geojson';
 import type {MapGeoJSONFeature} from '../util/vectortile_to_geojson';
 import {mapObject, extend} from '../util/util';
-import {OverscaledTileID} from '../source/tile_id';
+import {type OverscaledTileID} from '../source/tile_id';
 import {register} from '../util/web_worker_transfer';
 import {EvaluationParameters} from '../style/evaluation_parameters';
-import {SourceFeatureState} from '../source/source_state';
+import {type SourceFeatureState} from '../source/source_state';
 import {polygonIntersectsBox} from '../util/intersection_tests';
 import {PossiblyEvaluated} from '../style/properties';
 import {FeatureIndexArray} from './array_types.g';
-import {mat4} from 'gl-matrix';
+import {type mat4} from 'gl-matrix';
 
 import type {StyleLayer} from '../style/style_layer';
 import type {FeatureFilter, FeatureState, FilterSpecification, PromoteIdSpecification} from '@maplibre/maplibre-gl-style-spec';

src/data/program_configuration.ts

@@ -1,13 +1,13 @@
 import {packUint8ToFloat} from '../shaders/encode_attribute';
-import {Color, supportsPropertyExpression} from '@maplibre/maplibre-gl-style-spec';
+import {type Color, supportsPropertyExpression} from '@maplibre/maplibre-gl-style-spec';
 import {register} from '../util/web_worker_transfer';
 import {PossiblyEvaluatedPropertyValue} from '../style/properties';
 import {StructArrayLayout1f4, StructArrayLayout2f8, StructArrayLayout4f16, PatternLayoutArray} from './array_types.g';
 import {clamp} from '../util/util';
 import {patternAttributes} from './bucket/pattern_attributes';
 import {EvaluationParameters} from '../style/evaluation_parameters';
 import {FeaturePositionMap} from './feature_position_map';
-import {Uniform, Uniform1f, UniformColor, Uniform4f} from '../render/uniform_binding';
+import {type Uniform, Uniform1f, UniformColor, Uniform4f} from '../render/uniform_binding';
 
 import type {UniformLocations} from '../render/uniform_binding';
 

src/geo/edge_insets.ts

@@ -1,6 +1,6 @@
 import {interpolates} from '@maplibre/maplibre-gl-style-spec';
 import Point from '@mapbox/point-geometry';
-import {clamp, Complete, RequireAtLeastOne} from '../util/util';
+import {clamp, type Complete, type RequireAtLeastOne} from '../util/util';
 
 /**
  * An `EdgeInset` object represents screen space padding applied to the edges of the viewport.

src/geo/mercator_coordinate.ts

@@ -1,6 +1,6 @@
 import {LngLat, earthRadius} from '../geo/lng_lat';
 import type {LngLatLike} from '../geo/lng_lat';
-import {IMercatorCoordinate} from '@maplibre/maplibre-gl-style-spec';
+import {type IMercatorCoordinate} from '@maplibre/maplibre-gl-style-spec';
 
 /*
  * The average circumference of the world in meters.

src/geo/projection/camera_helper.ts

@@ -1,10 +1,10 @@
-import Point from '@mapbox/point-geometry';
-import {IReadonlyTransform, ITransform} from '../transform_interface';
-import {LngLat, LngLatLike} from '../lng_lat';
-import {CameraForBoundsOptions, PointLike} from '../../ui/camera';
-import {PaddingOptions} from '../edge_insets';
-import {LngLatBounds} from '../lng_lat_bounds';
-import {getRollPitchBearing, RollPitchBearing, warnOnce} from '../../util/util';
+import type Point from '@mapbox/point-geometry';
+import {type IReadonlyTransform, type ITransform} from '../transform_interface';
+import {type LngLat, type LngLatLike} from '../lng_lat';
+import {type CameraForBoundsOptions, type PointLike} from '../../ui/camera';
+import {type PaddingOptions} from '../edge_insets';
+import {type LngLatBounds} from '../lng_lat_bounds';
+import {getRollPitchBearing, type RollPitchBearing, warnOnce} from '../../util/util';
 import {quat} from 'gl-matrix';
 
 export type MapControlsDeltas = {

src/geo/projection/covering_tiles.ts

@@ -1,12 +1,12 @@
 import {OverscaledTileID} from '../../source/tile_id';
-import {vec2, vec4} from 'gl-matrix';
-import {IReadonlyTransform} from '../transform_interface';
+import {vec2, type vec4} from 'gl-matrix';
+import {type IReadonlyTransform} from '../transform_interface';
 import {MercatorCoordinate} from '../mercator_coordinate';
 import {scaleZoom} from '../transform_helper';
 import {clamp, degreesToRadians} from '../../util/util';
-import {Terrain} from '../../render/terrain';
-import {Frustum} from '../../util/primitives/frustum';
-import {Aabb, IntersectionResult} from '../../util/primitives/aabb';
+import {type Terrain} from '../../render/terrain';
+import {type Frustum} from '../../util/primitives/frustum';
+import {type Aabb, IntersectionResult} from '../../util/primitives/aabb';
 
 type CoveringTilesResult = {
     tileID: OverscaledTileID;

src/geo/projection/covering_tiles_details_provider.ts

@@ -1,7 +1,7 @@
-import {Aabb} from '../../util/primitives/aabb';
-import {MercatorCoordinate} from '../mercator_coordinate';
-import {IReadonlyTransform} from '../transform_interface';
-import {CoveringTilesOptions} from './covering_tiles';
+import {type Aabb} from '../../util/primitives/aabb';
+import {type MercatorCoordinate} from '../mercator_coordinate';
+import {type IReadonlyTransform} from '../transform_interface';
+import {type CoveringTilesOptions} from './covering_tiles';
 
 export interface CoveringTilesDetailsProvider {
     /**

src/geo/projection/globe.ts

@@ -1,15 +1,15 @@
 import type {Context} from '../../gl/context';
 import type {CanonicalTileID} from '../../source/tile_id';
-import {Mesh} from '../../render/mesh';
+import {type Mesh} from '../../render/mesh';
 import {browser} from '../../util/browser';
 import {easeCubicInOut, lerp} from '../../util/util';
 import {mercatorYfromLat} from '../mercator_coordinate';
 import {SubdivisionGranularityExpression, SubdivisionGranularitySetting} from '../../render/subdivision_granularity_settings';
 import type {Projection, ProjectionGPUContext, TileMeshUsage} from './projection';
-import {PreparedShader, shaders} from '../../shaders/shaders';
+import {type PreparedShader, shaders} from '../../shaders/shaders';
 import {MercatorProjection} from './mercator';
 import {ProjectionErrorMeasurement} from './globe_projection_error_measurement';
-import {createTileMeshWithBuffers, CreateTileMeshOptions} from '../../util/create_tile_mesh';
+import {createTileMeshWithBuffers, type CreateTileMeshOptions} from '../../util/create_tile_mesh';
 
 export const globeConstants = {
     globeTransitionTimeSeconds: 0.5,

src/geo/projection/globe_camera_helper.ts

@@ -1,16 +1,16 @@
 import Point from '@mapbox/point-geometry';
-import {IReadonlyTransform, ITransform} from '../transform_interface';
-import {cameraBoundsWarning, CameraForBoxAndBearingHandlerResult, EaseToHandlerResult, EaseToHandlerOptions, FlyToHandlerResult, FlyToHandlerOptions, ICameraHelper, MapControlsDeltas, updateRotation} from './camera_helper';
-import {GlobeProjection} from './globe';
-import {LngLat, LngLatLike} from '../lng_lat';
+import {type IReadonlyTransform, type ITransform} from '../transform_interface';
+import {cameraBoundsWarning, type CameraForBoxAndBearingHandlerResult, type EaseToHandlerResult, type EaseToHandlerOptions, type FlyToHandlerResult, type FlyToHandlerOptions, type ICameraHelper, type MapControlsDeltas, updateRotation} from './camera_helper';
+import {type GlobeProjection} from './globe';
+import {LngLat, type LngLatLike} from '../lng_lat';
 import {MercatorCameraHelper} from './mercator_camera_helper';
 import {angularCoordinatesToSurfaceVector, computeGlobePanCenter, getGlobeRadiusPixels, getZoomAdjustment, globeDistanceOfLocationsPixels, interpolateLngLatForGlobe} from './globe_utils';
 import {clamp, createVec3f64, differenceOfAnglesDegrees, remapSaturate, rollPitchBearingToQuat, warnOnce} from '../../util/util';
-import {mat4, quat, vec3} from 'gl-matrix';
+import {type mat4, quat, vec3} from 'gl-matrix';
 import {MAX_VALID_LATITUDE, normalizeCenter, scaleZoom, zoomScale} from '../transform_helper';
-import {CameraForBoundsOptions} from '../../ui/camera';
-import {LngLatBounds} from '../lng_lat_bounds';
-import {PaddingOptions} from '../edge_insets';
+import {type CameraForBoundsOptions} from '../../ui/camera';
+import {type LngLatBounds} from '../lng_lat_bounds';
+import {type PaddingOptions} from '../edge_insets';
 import {interpolates} from '@maplibre/maplibre-gl-style-spec';
 
 /**

src/geo/projection/globe_covering_tiles_details_provider.ts

@@ -1,10 +1,10 @@
-import {vec3} from 'gl-matrix';
-import {IReadonlyTransform} from '../transform_interface';
-import {MercatorCoordinate} from '../mercator_coordinate';
+import {type vec3} from 'gl-matrix';
+import {type IReadonlyTransform} from '../transform_interface';
+import {type MercatorCoordinate} from '../mercator_coordinate';
 import {EXTENT} from '../../data/extent';
 import {projectTileCoordinatesToSphere} from './globe_utils';
-import {CoveringTilesOptions, coveringZoomLevel} from './covering_tiles';
-import {CoveringTilesDetailsProvider} from './covering_tiles_details_provider';
+import {type CoveringTilesOptions, coveringZoomLevel} from './covering_tiles';
+import {type CoveringTilesDetailsProvider} from './covering_tiles_details_provider';
 import {Aabb} from '../../util/primitives/aabb';
 import {AabbCache} from '../../util/primitives/aabb_cache';
 

src/geo/projection/globe_projection_error_measurement.ts

@@ -9,9 +9,9 @@ import {Mesh} from '../../render/mesh';
 import {SegmentVector} from '../../data/segment';
 import {PosArray, TriangleIndexArray} from '../../data/array_types.g';
 import posAttributes from '../../data/pos_attributes';
-import {Framebuffer} from '../../gl/framebuffer';
+import {type Framebuffer} from '../../gl/framebuffer';
 import {isWebGL2} from '../../gl/webgl2';
-import {ProjectionGPUContext} from './projection';
+import {type ProjectionGPUContext} from './projection';
 
 /**
  * For vector globe the vertex shader projects mercator coordinates to angular coordinates on a sphere.

src/geo/projection/globe_transform.test.ts

@@ -1,4 +1,4 @@
-import {globeConstants, GlobeProjection} from './globe';
+import {globeConstants, type GlobeProjection} from './globe';
 import {EXTENT} from '../../data/extent';
 import Point from '@mapbox/point-geometry';
 import {LngLat} from '../lng_lat';

src/geo/projection/globe_transform.ts

@@ -1,25 +1,25 @@
-import {mat2, mat4, vec3, vec4} from 'gl-matrix';
+import {type mat2, mat4, vec3, vec4} from 'gl-matrix';
 import {MAX_VALID_LATITUDE, TransformHelper} from '../transform_helper';
 import {MercatorTransform} from './mercator_transform';
-import {LngLat, LngLatLike, earthRadius} from '../lng_lat';
+import {LngLat, type LngLatLike, earthRadius} from '../lng_lat';
 import {angleToRotateBetweenVectors2D, clamp, createIdentityMat4f64, createMat4f64, createVec3f64, createVec4f64, differenceOfAnglesDegrees, distanceOfAnglesRadians, easeCubicInOut, lerp, pointPlaneSignedDistance, warnOnce} from '../../util/util';
-import {UnwrappedTileID, OverscaledTileID, CanonicalTileID} from '../../source/tile_id';
+import {UnwrappedTileID, OverscaledTileID, type CanonicalTileID} from '../../source/tile_id';
 import Point from '@mapbox/point-geometry';
 import {browser} from '../../util/browser';
-import {Terrain} from '../../render/terrain';
-import {GlobeProjection, globeConstants} from './globe';
+import {type Terrain} from '../../render/terrain';
+import {type GlobeProjection, globeConstants} from './globe';
 import {MercatorCoordinate} from '../mercator_coordinate';
-import {PointProjection} from '../../symbol/projection';
+import {type PointProjection} from '../../symbol/projection';
 import {LngLatBounds} from '../lng_lat_bounds';
-import {IReadonlyTransform, ITransform, TransformUpdateResult} from '../transform_interface';
-import {PaddingOptions} from '../edge_insets';
+import {type IReadonlyTransform, type ITransform, type TransformUpdateResult} from '../transform_interface';
+import {type PaddingOptions} from '../edge_insets';
 import {tileCoordinatesToMercatorCoordinates} from './mercator_utils';
 import {angularCoordinatesToSurfaceVector, getGlobeRadiusPixels, getZoomAdjustment, mercatorCoordinatesToAngularCoordinatesRadians, projectTileCoordinatesToSphere, sphereSurfacePointToCoordinates} from './globe_utils';
 import {EXTENT} from '../../data/extent';
 import type {ProjectionData, ProjectionDataParams} from './projection_data';
 import {GlobeCoveringTilesDetailsProvider} from './globe_covering_tiles_details_provider';
 import {Frustum} from '../../util/primitives/frustum';
-import {CoveringTilesDetailsProvider} from './covering_tiles_details_provider';
+import {type CoveringTilesDetailsProvider} from './covering_tiles_details_provider';
 
 /**
  * Describes the intersection of ray and sphere.

src/geo/projection/globe_utils.ts

@@ -2,7 +2,7 @@ import {vec3} from 'gl-matrix';
 import {clamp, lerp, mod, remapSaturate, wrap} from '../../util/util';
 import {LngLat} from '../lng_lat';
 import {MAX_VALID_LATITUDE, scaleZoom} from '../transform_helper';
-import Point from '@mapbox/point-geometry';
+import type Point from '@mapbox/point-geometry';
 import {EXTENT} from '../../data/extent';
 
 export function getGlobeCircumferencePixels(transform: {worldSize: number; center: {lat: number}}): number {