@mapbox/mapbox-gl-style-spec 14.11.0-beta.2 → 14.12.0-beta.1

package/types.ts

@@ -171,49 +171,106 @@ export type FogSpecification = {
 }
 
 export type SnowSpecification = {
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
     "density"?: PropertyValueSpecification<number>,
     "density-transition"?: TransitionSpecification,
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
     "intensity"?: PropertyValueSpecification<number>,
     "intensity-transition"?: TransitionSpecification,
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
     "color"?: PropertyValueSpecification<ColorSpecification>,
     "color-transition"?: TransitionSpecification,
     "color-use-theme"?: PropertyValueSpecification<string>,
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
     "opacity"?: PropertyValueSpecification<number>,
     "opacity-transition"?: TransitionSpecification,
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
     "vignette"?: PropertyValueSpecification<number>,
     "vignette-transition"?: TransitionSpecification,
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
     "vignette-color"?: PropertyValueSpecification<ColorSpecification>,
     "vignette-color-transition"?: TransitionSpecification,
     "vignette-color-use-theme"?: PropertyValueSpecification<string>,
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
     "center-thinning"?: PropertyValueSpecification<number>,
     "center-thinning-transition"?: TransitionSpecification,
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
     "direction"?: PropertyValueSpecification<[number, number]>,
     "direction-transition"?: TransitionSpecification,
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
     "flake-size"?: PropertyValueSpecification<number>,
     "flake-size-transition"?: TransitionSpecification
 }
 
 export type RainSpecification = {
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
     "density"?: PropertyValueSpecification<number>,
     "density-transition"?: TransitionSpecification,
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
     "intensity"?: PropertyValueSpecification<number>,
     "intensity-transition"?: TransitionSpecification,
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
     "color"?: PropertyValueSpecification<ColorSpecification>,
     "color-transition"?: TransitionSpecification,
     "color-use-theme"?: PropertyValueSpecification<string>,
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
     "opacity"?: PropertyValueSpecification<number>,
     "opacity-transition"?: TransitionSpecification,
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
     "vignette"?: PropertyValueSpecification<number>,
     "vignette-transition"?: TransitionSpecification,
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
     "vignette-color"?: PropertyValueSpecification<ColorSpecification>,
     "vignette-color-transition"?: TransitionSpecification,
     "vignette-color-use-theme"?: PropertyValueSpecification<string>,
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
     "center-thinning"?: PropertyValueSpecification<number>,
     "center-thinning-transition"?: TransitionSpecification,
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
     "direction"?: PropertyValueSpecification<[number, number]>,
     "direction-transition"?: TransitionSpecification,
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
     "droplet-size"?: PropertyValueSpecification<[number, number]>,
     "droplet-size-transition"?: TransitionSpecification,
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
     "distortion-strength"?: PropertyValueSpecification<number>,
     "distortion-strength-transition"?: TransitionSpecification
 }
@@ -535,11 +592,20 @@ export type FillLayerSpecification = {
         "fill-pattern"?: DataDrivenPropertyValueSpecification<ResolvedImageSpecification>,
         "fill-emissive-strength"?: PropertyValueSpecification<number>,
         "fill-emissive-strength-transition"?: TransitionSpecification,
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
         "fill-z-offset"?: DataDrivenPropertyValueSpecification<number>,
         "fill-z-offset-transition"?: TransitionSpecification,
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
         "fill-bridge-guard-rail-color"?: DataDrivenPropertyValueSpecification<ColorSpecification>,
         "fill-bridge-guard-rail-color-transition"?: TransitionSpecification,
         "fill-bridge-guard-rail-color-use-theme"?: PropertyValueSpecification<string>,
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
         "fill-tunnel-structure-color"?: DataDrivenPropertyValueSpecification<ColorSpecification>,
         "fill-tunnel-structure-color-transition"?: TransitionSpecification,
         "fill-tunnel-structure-color-use-theme"?: PropertyValueSpecification<string>
@@ -616,6 +682,9 @@ export type LineLayerSpecification = {
          * @experimental This property is experimental and subject to change in future versions.
          */
         "line-trim-fade-range"?: PropertyValueSpecification<[number, number]>,
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
         "line-trim-color"?: PropertyValueSpecification<ColorSpecification>,
         "line-trim-color-transition"?: TransitionSpecification,
         "line-trim-color-use-theme"?: PropertyValueSpecification<string>,
@@ -753,6 +822,9 @@ export type SymbolLayerSpecification = {
         "icon-color-contrast"?: ExpressionSpecification,
         "icon-color-brightness-min"?: ExpressionSpecification,
         "icon-color-brightness-max"?: ExpressionSpecification,
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
         "symbol-z-offset"?: DataDrivenPropertyValueSpecification<number>,
         "symbol-z-offset-transition"?: TransitionSpecification
     }
@@ -903,23 +975,50 @@ export type FillExtrusionLayerSpecification = {
         "fill-extrusion-ambient-occlusion-intensity-transition"?: TransitionSpecification,
         "fill-extrusion-ambient-occlusion-radius"?: PropertyValueSpecification<number>,
         "fill-extrusion-ambient-occlusion-radius-transition"?: TransitionSpecification,
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
         "fill-extrusion-ambient-occlusion-wall-radius"?: PropertyValueSpecification<number>,
         "fill-extrusion-ambient-occlusion-wall-radius-transition"?: TransitionSpecification,
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
         "fill-extrusion-ambient-occlusion-ground-radius"?: PropertyValueSpecification<number>,
         "fill-extrusion-ambient-occlusion-ground-radius-transition"?: TransitionSpecification,
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
         "fill-extrusion-ambient-occlusion-ground-attenuation"?: PropertyValueSpecification<number>,
         "fill-extrusion-ambient-occlusion-ground-attenuation-transition"?: TransitionSpecification,
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
         "fill-extrusion-flood-light-color"?: PropertyValueSpecification<ColorSpecification>,
         "fill-extrusion-flood-light-color-transition"?: TransitionSpecification,
         "fill-extrusion-flood-light-color-use-theme"?: PropertyValueSpecification<string>,
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
         "fill-extrusion-flood-light-intensity"?: PropertyValueSpecification<number>,
         "fill-extrusion-flood-light-intensity-transition"?: TransitionSpecification,
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
         "fill-extrusion-flood-light-wall-radius"?: DataDrivenPropertyValueSpecification<number>,
         "fill-extrusion-flood-light-wall-radius-transition"?: TransitionSpecification,
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
         "fill-extrusion-flood-light-ground-radius"?: DataDrivenPropertyValueSpecification<number>,
         "fill-extrusion-flood-light-ground-radius-transition"?: TransitionSpecification,
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
         "fill-extrusion-flood-light-ground-attenuation"?: PropertyValueSpecification<number>,
         "fill-extrusion-flood-light-ground-attenuation-transition"?: TransitionSpecification,
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
         "fill-extrusion-vertical-scale"?: PropertyValueSpecification<number>,
         "fill-extrusion-vertical-scale-transition"?: TransitionSpecification,
         /**
@@ -929,6 +1028,9 @@ export type FillExtrusionLayerSpecification = {
         "fill-extrusion-cutoff-fade-range"?: ExpressionSpecification,
         "fill-extrusion-emissive-strength"?: DataDrivenPropertyValueSpecification<number>,
         "fill-extrusion-emissive-strength-transition"?: TransitionSpecification,
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
         "fill-extrusion-line-width"?: DataDrivenPropertyValueSpecification<number>,
         "fill-extrusion-line-width-transition"?: TransitionSpecification,
         "fill-extrusion-cast-shadows"?: boolean
@@ -945,6 +1047,90 @@ export type FillExtrusionLayout = FillExtrusionLayerSpecification['layout'];
  */
 export type FillExtrusionPaint = FillExtrusionLayerSpecification['paint'];
 
+export type BuildingLayerSpecification = {
+    "id": string,
+    "type": "building",
+    "metadata"?: unknown,
+    "source": string,
+    "source-layer"?: string,
+    "slot"?: string,
+    "minzoom"?: number,
+    "maxzoom"?: number,
+    "filter"?: FilterSpecification,
+    "layout"?: {
+        "visibility"?: "visible" | "none" | ExpressionSpecification,
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
+        "building-roof-shape"?: DataDrivenPropertyValueSpecification<"flat" | "hipped" | "gabled" | "parapet" | "mansard" | "skillion" | "pyramidal">,
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
+        "building-height"?: DataDrivenPropertyValueSpecification<number>,
+        "building-height-transition"?: TransitionSpecification,
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
+        "building-base"?: DataDrivenPropertyValueSpecification<number>,
+        "building-base-transition"?: TransitionSpecification
+    },
+    "paint"?: {
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
+        "building-opacity"?: PropertyValueSpecification<number>,
+        "building-opacity-transition"?: TransitionSpecification,
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
+        "building-ambient-occlusion-wall-intensity"?: PropertyValueSpecification<number>,
+        "building-ambient-occlusion-wall-intensity-transition"?: TransitionSpecification,
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
+        "building-ambient-occlusion-ground-intensity"?: PropertyValueSpecification<number>,
+        "building-ambient-occlusion-ground-intensity-transition"?: TransitionSpecification,
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
+        "building-ambient-occlusion-ground-radius"?: PropertyValueSpecification<number>,
+        "building-ambient-occlusion-ground-radius-transition"?: TransitionSpecification,
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
+        "building-ambient-occlusion-ground-attenuation"?: PropertyValueSpecification<number>,
+        "building-ambient-occlusion-ground-attenuation-transition"?: TransitionSpecification,
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
+        "building-vertical-scale"?: PropertyValueSpecification<number>,
+        "building-vertical-scale-transition"?: TransitionSpecification,
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
+        "building-cast-shadows"?: boolean,
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
+        "building-color"?: DataDrivenPropertyValueSpecification<ColorSpecification>,
+        "building-color-use-theme"?: PropertyValueSpecification<string>,
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
+        "building-emissive-strength"?: DataDrivenPropertyValueSpecification<number>
+    }
+}
+
+/**
+ * @deprecated Use `BuildingLayerSpecification['layout']` instead.
+ */
+export type BuildingLayout = BuildingLayerSpecification['layout'];
+
+/**
+ * @deprecated Use `BuildingLayerSpecification['paint']` instead.
+ */
+export type BuildingPaint = BuildingLayerSpecification['paint'];
+
 export type RasterLayerSpecification = {
     "id": string,
     "type": "raster",
@@ -985,6 +1171,9 @@ export type RasterLayerSpecification = {
          * @experimental This property is experimental and subject to change in future versions.
          */
         "raster-array-band"?: string,
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
         "raster-elevation"?: PropertyValueSpecification<number>,
         "raster-elevation-transition"?: TransitionSpecification
     }
@@ -1257,6 +1446,7 @@ export type LayerSpecification =
     | CircleLayerSpecification
     | HeatmapLayerSpecification
     | FillExtrusionLayerSpecification
+    | BuildingLayerSpecification
     | RasterLayerSpecification
     | RasterParticleLayerSpecification
     | HillshadeLayerSpecification
@@ -1327,6 +1517,11 @@ export type HeatmapLayer = HeatmapLayerSpecification;
  */
 export type FillExtrusionLayer = FillExtrusionLayerSpecification;
 
+/**
+ * @deprecated Use `BuildingLayerSpecification` instead.
+ */
+export type BuildingLayer = BuildingLayerSpecification;
+
 /**
  * @deprecated Use `RasterLayerSpecification` instead.
  */

package/util/extend.ts

@@ -1,4 +1,4 @@
-export default function(output: any, ...inputs: Array<any>): any {
+export default function (output: any, ...inputs: Array<any>): any {
     for (const input of inputs) {
         for (const k in input) {
             output[k] = input[k];

package/util/geometry_util.ts

@@ -1,6 +1,5 @@
 import quickselect from 'quickselect';
-
-import type Point from '@mapbox/point-geometry';
+import Point from '@mapbox/point-geometry';
 
 // minX, minY, maxX, maxY
 export type BBox = [number, number, number, number];
@@ -154,3 +153,21 @@ export function segmentIntersectSegment(
     return false;
 }
 
+export interface Bounds {
+    min: Point;
+    max: Point;
+}
+
+export function computeBounds(points: Point[][]): Bounds {
+    const min = new Point(Number.POSITIVE_INFINITY, Number.POSITIVE_INFINITY);
+    const max = new Point(Number.NEGATIVE_INFINITY, Number.NEGATIVE_INFINITY);
+
+    for (const point of points[0]) {
+        if (min.x > point.x) min.x = point.x;
+        if (min.y > point.y) min.y = point.y;
+        if (max.x < point.x) max.x = point.x;
+        if (max.y < point.y) max.y = point.y;
+    }
+
+    return {min, max};
+}

package/util/interpolate.ts

@@ -18,3 +18,7 @@ export function array(from: Array<number>, to: Array<number>, t: number): Array<
         return number(d, to[i], t);
     });
 }
+
+export function easeIn(x: number) {
+    return x * x * x * x * x;
+}

package/validate/validate_fog.ts

@@ -27,7 +27,7 @@ export default function validateFog(options: ValidationOptions): Array<Validatio
             errors = errors.concat(validate({
                 key,
                 value: fog[key],
-                valueSpec: {type:'string'},
+                valueSpec: {type: 'string'},
                 style,
                 styleSpec
             }));

package/validate/validate_glyphs_url.ts

@@ -3,7 +3,7 @@ import validateString from './validate_string';
 
 import type {ValidationOptions} from './validate';
 
-export default function(options: ValidationOptions): Array<ValidationError> {
+export default function (options: ValidationOptions): Array<ValidationError> {
     const value = options.value;
     const key = options.key;
 

package/validate/validate_layer.ts

@@ -79,8 +79,8 @@ export default function validateLayer(options: Options): Array<ValidationError>
             } else if (sourceType === 'raster-array' && !['raster', 'raster-particle'].includes(type)) {
                 errors.push(new ValidationError(key, layer.source, `raster-array source can only be used with layer type \'raster\'.`));
             } else if (type === 'line' && layer.paint && (layer.paint['line-gradient'] || layer.paint['line-trim-offset']) &&
-                    (sourceType !== 'geojson' || !(source as GeoJSONSourceSpecification).lineMetrics)) {
-                errors.push(new ValidationError(key, layer, `layer "${layer.id}" specifies a line-gradient, which requires a GeoJSON source with \`lineMetrics\` enabled.`));
+                    (sourceType === 'geojson' && !(source as GeoJSONSourceSpecification).lineMetrics)) {
+                errors.push(new ValidationError(key, layer, `layer "${layer.id}" specifies a line-gradient, which requires the GeoJSON source to have \`lineMetrics\` enabled.`));
             } else if (type === 'raster-particle' && sourceType !== 'raster-array') {
                 errors.push(new ValidationError(key, layer.source, `layer "${layer.id}" requires a \'raster-array\' source.`));
             }

package/validate/validate_light.ts

@@ -28,7 +28,7 @@ export default function validateLight(options: ValidationOptions): Array<Validat
             errors = errors.concat(validate({
                 key,
                 value: light[key],
-                valueSpec: {type:'string'},
+                valueSpec: {type: 'string'},
                 style,
                 styleSpec
             }));

package/validate/validate_lights.ts

@@ -85,7 +85,7 @@ export default function validateLights(options: Options): Array<ValidationError>
                 errors = errors.concat(validate({
                     key,
                     value: light[key],
-                    valueSpec: {type:'string'},
+                    valueSpec: {type: 'string'},
                     style,
                     styleSpec
                 }));

package/validate/validate_property.ts

@@ -55,7 +55,7 @@ export default function validateProperty(options: PropertyValidationOptions, pro
         return validate({
             key,
             value,
-            valueSpec: {type:'string'},
+            valueSpec: {type: 'string'},
             style,
             styleSpec
         });

package/validate/validate_source.ts

@@ -25,10 +25,9 @@ export default function validateSource(options: ValidationOptions): Array<Valida
         return [new ValidationError(key, value, '"type" is required')];
     }
 
-    const type = unbundle(value.type);
+    const type = unbundle(value.type) as string;
     let errors = [];
 
-    // @ts-expect-error - TS2345 - Argument of type 'unknown' is not assignable to parameter of type 'string'.
     if (['vector', 'raster', 'raster-dem', 'raster-array'].includes(type)) {
         if (!value.url && !value.tiles) {
             errors.push(new ValidationWarning(key, value, 'Either "url" or "tiles" is required.'));
@@ -111,8 +110,7 @@ export default function validateSource(options: ValidationOptions): Array<Valida
 }
 
 function getSourceTypeValues(styleSpec: StyleReference) {
-// @ts-expect-error - TS2347 - Untyped function calls may not accept type arguments.
-    return styleSpec.source.reduce<Array<any>>((memo, source) => {
+    return styleSpec.source.reduce((memo, source) => {
         const sourceType = styleSpec[source];
         if (sourceType.type.type === 'enum') {
             memo = memo.concat(Object.keys(sourceType.type.values));

package/validate/validate_style.ts

@@ -3,6 +3,7 @@ import latestStyleSpec from '../reference/latest';
 import validateGlyphsURL from './validate_glyphs_url';
 
 import type ValidationError from '../error/validation_error';
+import type {StyleReference} from '../reference/latest';
 import type {ValidationOptions} from './validate';
 import type {StyleSpecification} from '../types';
 
@@ -12,7 +13,7 @@ type StyleValidationOptions = {
 
 export default function validateStyle(
     style: StyleSpecification,
-    styleSpec: any = latestStyleSpec,
+    styleSpec: StyleReference = latestStyleSpec,
     options: StyleValidationOptions = {},
 ): ValidationError[] {
     const errors = validate({

package/validate/validate_terrain.ts

@@ -31,7 +31,7 @@ export default function validateTerrain(options: ValidationOptions): Array<Valid
             errors = errors.concat(validate({
                 key,
                 value: terrain[key],
-                valueSpec: {type:'string'},
+                valueSpec: {type: 'string'},
                 style,
                 styleSpec
             }));

package/validate_mapbox_api_supported.ts

@@ -212,7 +212,7 @@ export default function validateMapboxApiSupported(style: any, styleSpec: any =
     let s = style;
     try {
         s = readStyle(s);
-    } catch (e: any) {
+    } catch (e) {
         return [e];
     }
 

package/validate_style.min.ts

@@ -13,6 +13,7 @@ import _validatePaintProperty from './validate/validate_paint_property';
 import _validateLayoutProperty from './validate/validate_layout_property';
 import _validateModel from './validate/validate_model';
 
+import type {StyleReference} from './reference/latest';
 import type {StyleSpecification} from './types';
 
 export type ValidationError = {
@@ -20,8 +21,9 @@ export type ValidationError = {
     identifier?: string | null | undefined;
     line?: number | null | undefined;
 };
+
 export type ValidationErrors = ReadonlyArray<ValidationError>;
-export type Validator = (arg1: any) => ValidationErrors;
+export type Validator<T extends (...args: unknown[]) => unknown = (...args: unknown[]) => unknown> = (...args: Parameters<T>) => ValidationErrors;
 
 /**
  * Validate a Mapbox GL style against the style specification. This entrypoint,
@@ -38,24 +40,24 @@ export type Validator = (arg1: any) => ValidationErrors;
  *   var validate = require('mapbox-gl-style-spec/lib/validate_style.min');
  *   var errors = validate(style);
  */
-export function validateStyle(style: StyleSpecification, styleSpec: any = latestStyleSpec): ValidationErrors {
+export function validateStyle(style: StyleSpecification, styleSpec: StyleReference = latestStyleSpec): ValidationErrors {
     const errors = _validateStyle(style, styleSpec);
     return sortErrors(errors);
 }
 
-export const validateSource: Validator = opts => sortErrors(_validateSource(opts));
-export const validateLight: Validator = opts => sortErrors(_validateLight(opts));
-export const validateLights: Validator = opts => sortErrors(_validateLights(opts));
-export const validateTerrain: Validator = opts => sortErrors(_validateTerrain(opts));
-export const validateFog: Validator = opts => sortErrors(_validateFog(opts));
-export const validateSnow: Validator = opts => sortErrors(_validateSnow(opts));
-export const validateRain: Validator = opts => sortErrors(_validateRain(opts));
-export const validateLayer: Validator = opts => sortErrors(_validateLayer(opts));
-export const validateFilter: Validator = opts => sortErrors(_validateFilter(opts));
-export const validatePaintProperty: Validator = opts => sortErrors(_validatePaintProperty(opts));
-export const validateLayoutProperty: Validator = opts => sortErrors(_validateLayoutProperty(opts));
-export const validateModel: Validator = opts => sortErrors(_validateModel(opts));
+export const validateSource: Validator<typeof _validateSource> = opts => sortErrors(_validateSource(opts));
+export const validateLight: Validator<typeof _validateLight> = opts => sortErrors(_validateLight(opts));
+export const validateLights: Validator<typeof _validateLights> = opts => sortErrors(_validateLights(opts));
+export const validateTerrain: Validator<typeof _validateTerrain> = opts => sortErrors(_validateTerrain(opts));
+export const validateFog: Validator<typeof _validateFog> = opts => sortErrors(_validateFog(opts));
+export const validateSnow: Validator<typeof _validateSnow> = opts => sortErrors(_validateSnow(opts));
+export const validateRain: Validator<typeof _validateRain> = opts => sortErrors(_validateRain(opts));
+export const validateLayer: Validator<typeof _validateLayer> = opts => sortErrors(_validateLayer(opts));
+export const validateFilter: Validator<typeof _validateFilter> = opts => sortErrors(_validateFilter(opts));
+export const validatePaintProperty: Validator<typeof _validatePaintProperty> = opts => sortErrors(_validatePaintProperty(opts));
+export const validateLayoutProperty: Validator<typeof _validateLayoutProperty> = opts => sortErrors(_validateLayoutProperty(opts));
+export const validateModel: Validator<typeof _validateModel> = opts => sortErrors(_validateModel(opts));
 
-function sortErrors(errors: ValidationErrors) {
+function sortErrors(errors: ValidationErrors): ValidationErrors {
     return errors.slice().sort((a, b) => a.line && b.line ? a.line - b.line : 0);
 }

package/validate_style.ts

@@ -2,6 +2,7 @@ import {validateStyle as validateStyleMin} from './validate_style.min';
 import {v8} from './style-spec';
 import readStyle from './read_style';
 
+import type {StyleReference} from './reference/latest';
 import type {ValidationErrors} from './validate_style.min';
 import type {StyleSpecification} from './types';
 
@@ -21,16 +22,15 @@ import type {StyleSpecification} from './types';
  *   var errors = validate(style);
  */
 
-export default function validateStyle(style: StyleSpecification | string | Buffer, styleSpec: any = v8): ValidationErrors {
+export default function validateStyle(style: StyleSpecification | string | Buffer, styleSpec: StyleReference = v8): ValidationErrors {
     let s = style;
 
     try {
         s = readStyle(s);
-    } catch (e: any) {
+    } catch (e) {
         return [e];
     }
 
-    // @ts-expect-error - TS2345 - Argument of type 'string | StyleSpecification | Buffer' is not assignable to parameter of type 'StyleSpecification'.
     return validateStyleMin(s, styleSpec);
 }
 

package/visit.ts

@@ -20,7 +20,7 @@ function getPropertyReference(propertyName: string): StylePropertySpecification
         }
     }
 
-    return null as any;
+    return null;
 }
 
 export function eachSource(style: StyleSpecification, callback: (_: SourceSpecification) => void) {