@mapbox/mapbox-gl-style-spec 14.4.0 → 14.5.0

package/{types.js → types.ts}

@@ -1,5 +1,4 @@
-// @flow
-// Generated code; do not edit. Edit build/generate-flow-typed-style-spec.js instead.
+// Generated code; do not edit. Edit build/generate-typed-style-spec.ts instead.
 /* eslint-disable */
 
 export type ColorSpecification = string;
@@ -19,7 +18,7 @@ export type FilterSpecification =
     | ['>=', string, string | number | boolean]
     | ['<', string, string | number | boolean]
     | ['<=', string, string | number | boolean]
-    | Array<string | FilterSpecification>; // Can't type in, !in, all, any, none -- https://github.com/facebook/flow/issues/2443
+    | Array<string | FilterSpecification>;
 
 export type TransitionSpecification = {
     duration?: number,
@@ -28,22 +27,37 @@ export type TransitionSpecification = {
 
 // Note: doesn't capture interpolatable vs. non-interpolatable types.
 
+export type PropertyFunctionStop<T> = [number, T];
+export type ZoomAndPropertyFunctionStop<T> = [{zoom: number; value: string | number | boolean}, T];
+
+/**
+ * @deprecated Use [Expressions](https://docs.mapbox.com/style-spec/reference/expressions/) syntax instead.
+*/
+export type FunctionSpecification<T> = {
+    stops: Array<PropertyFunctionStop<T> | ZoomAndPropertyFunctionStop<T>>;
+    base?: number;
+    property?: string;
+    type?: 'identity' | 'exponential' | 'interval' | 'categorical';
+    colorSpace?: 'rgb' | 'lab' | 'hcl';
+    default?: T;
+};
+
 export type CameraFunctionSpecification<T> =
-    | {| type: 'exponential', stops: Array<[number, T]> |}
-    | {| type: 'interval',    stops: Array<[number, T]> |};
+    | { type: 'exponential', stops: Array<[number, T]> }
+    | { type: 'interval',    stops: Array<[number, T]> };
 
 export type SourceFunctionSpecification<T> =
-    | {| type: 'exponential', stops: Array<[number, T]>, property: string, default?: T |}
-    | {| type: 'interval',    stops: Array<[number, T]>, property: string, default?: T |}
-    | {| type: 'categorical', stops: Array<[string | number | boolean, T]>, property: string, default?: T |}
-    | {| type: 'identity', property: string, default?: T |};
+    | { type: 'exponential', stops: Array<[number, T]>, property: string, default?: T }
+    | { type: 'interval',    stops: Array<[number, T]>, property: string, default?: T }
+    | { type: 'categorical', stops: Array<[string | number | boolean, T]>, property: string, default?: T }
+    | { type: 'identity', property: string, default?: T };
 
 export type CompositeFunctionSpecification<T> =
-    | {| type: 'exponential', stops: Array<[{zoom: number, value: number}, T]>, property: string, default?: T |}
-    | {| type: 'interval',    stops: Array<[{zoom: number, value: number}, T]>, property: string, default?: T |}
-    | {| type: 'categorical', stops: Array<[{zoom: number, value: string | number | boolean}, T]>, property: string, default?: T |};
+    | { type: 'exponential', stops: Array<[{zoom: number, value: number}, T]>, property: string, default?: T }
+    | { type: 'interval',    stops: Array<[{zoom: number, value: number}, T]>, property: string, default?: T }
+    | { type: 'categorical', stops: Array<[{zoom: number, value: string | number | boolean}, T]>, property: string, default?: T };
 
-export type ExpressionSpecification = Array<mixed>;
+export type ExpressionSpecification = [string, ...any[]];
 
 export type PropertyValueSpecification<T> =
     | T
@@ -52,25 +66,27 @@ export type PropertyValueSpecification<T> =
 
 export type DataDrivenPropertyValueSpecification<T> =
     | T
+    | FunctionSpecification<T>
     | CameraFunctionSpecification<T>
     | SourceFunctionSpecification<T>
     | CompositeFunctionSpecification<T>
     | ExpressionSpecification;
 
-export type StyleSpecification = {|
+export type StyleSpecification = {
     "version": 8,
     "fragment"?: boolean,
     "name"?: string,
-    "metadata"?: mixed,
+    "metadata"?: unknown,
     "center"?: Array<number>,
     "zoom"?: number,
     "bearing"?: number,
     "pitch"?: number,
     "light"?: LightSpecification,
     "lights"?: Array<LightsSpecification>,
-    "terrain"?: ?TerrainSpecification,
+    "terrain"?: TerrainSpecification | null | undefined,
     "fog"?: FogSpecification,
     "camera"?: CameraSpecification,
+    "color-theme"?: ColorThemeSpecification,
     "imports"?: Array<ImportSpecification>,
     "schema"?: SchemaSpecification,
     "sources": SourcesSpecification,
@@ -80,7 +96,7 @@ export type StyleSpecification = {|
     "projection"?: ProjectionSpecification,
     "layers": Array<LayerSpecification>,
     "models"?: ModelsSpecification
-|}
+}
 
 export type SourcesSpecification = {
     [_: string]: SourceSpecification
@@ -90,7 +106,7 @@ export type ModelsSpecification = {
     [_: string]: ModelSpecification
 }
 
-export type LightSpecification = {|
+export type LightSpecification = {
     "anchor"?: PropertyValueSpecification<"map" | "viewport">,
     "position"?: PropertyValueSpecification<[number, number, number]>,
     "position-transition"?: TransitionSpecification,
@@ -98,15 +114,15 @@ export type LightSpecification = {|
     "color-transition"?: TransitionSpecification,
     "intensity"?: PropertyValueSpecification<number>,
     "intensity-transition"?: TransitionSpecification
-|}
+}
 
-export type TerrainSpecification = {|
+export type TerrainSpecification = {
     "source": string,
     "exaggeration"?: PropertyValueSpecification<number>,
     "exaggeration-transition"?: TransitionSpecification
-|}
+}
 
-export type FogSpecification = {|
+export type FogSpecification = {
     "range"?: PropertyValueSpecification<[number, number]>,
     "range-transition"?: TransitionSpecification,
     "color"?: PropertyValueSpecification<ColorSpecification>,
@@ -121,44 +137,48 @@ export type FogSpecification = {|
     "star-intensity-transition"?: TransitionSpecification,
     "vertical-range"?: PropertyValueSpecification<[number, number]>,
     "vertical-range-transition"?: TransitionSpecification
-|}
+}
 
-export type CameraSpecification = {|
+export type CameraSpecification = {
     "camera-projection"?: PropertyValueSpecification<"perspective" | "orthographic">,
     "camera-projection-transition"?: TransitionSpecification
-|}
+}
+
+export type ColorThemeSpecification = {
+    "data"?: ExpressionSpecification
+}
 
-export type ProjectionSpecification = {|
+export type ProjectionSpecification = {
     "name": "albers" | "equalEarth" | "equirectangular" | "lambertConformalConic" | "mercator" | "naturalEarth" | "winkelTripel" | "globe",
     "center"?: [number, number],
     "parallels"?: [number, number]
-|}
+}
 
-export type ImportSpecification = {|
+export type ImportSpecification = {
     "id": string,
     "url": string,
     "config"?: ConfigSpecification,
     "data"?: StyleSpecification
-|}
+}
 
 export type ConfigSpecification = {
-    [_: string]: mixed
+    [_: string]: unknown
 }
 
 export type SchemaSpecification = {
     [_: string]: OptionSpecification
 }
 
-export type OptionSpecification = {|
-    "default": mixed,
+export type OptionSpecification = {
+    "default": ExpressionSpecification,
     "type"?: "string" | "number" | "boolean" | "color",
     "array"?: boolean,
     "minValue"?: number,
     "maxValue"?: number,
     "stepValue"?: number,
-    "values"?: Array<mixed>,
-    "metadata"?: mixed
-|}
+    "values"?: Array<unknown>,
+    "metadata"?: unknown
+}
 
 export type VectorSourceSpecification = {
     "type": "vector",
@@ -171,7 +191,7 @@ export type VectorSourceSpecification = {
     "attribution"?: string,
     "promoteId"?: PromoteIdSpecification,
     "volatile"?: boolean,
-    [_: string]: mixed
+    [_: string]: unknown
 }
 
 export type RasterSourceSpecification = {
@@ -185,7 +205,7 @@ export type RasterSourceSpecification = {
     "scheme"?: "xyz" | "tms",
     "attribution"?: string,
     "volatile"?: boolean,
-    [_: string]: mixed
+    [_: string]: unknown
 }
 
 export type RasterDEMSourceSpecification = {
@@ -199,9 +219,12 @@ export type RasterDEMSourceSpecification = {
     "attribution"?: string,
     "encoding"?: "terrarium" | "mapbox",
     "volatile"?: boolean,
-    [_: string]: mixed
+    [_: string]: unknown
 }
 
+/**
+ * @experimental This is experimental and subject to change in future versions.
+ */
 export type RasterArraySourceSpecification = {
     "type": "raster-array",
     "url"?: string,
@@ -211,49 +234,49 @@ export type RasterArraySourceSpecification = {
     "maxzoom"?: number,
     "tileSize"?: number,
     "attribution"?: string,
-    "rasterLayers"?: mixed,
+    "rasterLayers"?: unknown,
     "volatile"?: boolean,
-    [_: string]: mixed
+    [_: string]: unknown
 }
 
-export type GeoJSONSourceSpecification = {|
+export type GeoJSONSourceSpecification = {
     "type": "geojson",
-    "data"?: mixed,
+    "data"?: GeoJSON.GeoJSON | string,
     "maxzoom"?: number,
     "minzoom"?: number,
     "attribution"?: string,
     "buffer"?: number,
-    "filter"?: mixed,
+    "filter"?: unknown,
     "tolerance"?: number,
     "cluster"?: boolean,
     "clusterRadius"?: number,
     "clusterMaxZoom"?: number,
     "clusterMinPoints"?: number,
-    "clusterProperties"?: mixed,
+    "clusterProperties"?: unknown,
     "lineMetrics"?: boolean,
     "generateId"?: boolean,
     "promoteId"?: PromoteIdSpecification,
     "dynamic"?: boolean
-|}
+}
 
-export type VideoSourceSpecification = {|
+export type VideoSourceSpecification = {
     "type": "video",
     "urls": Array<string>,
     "coordinates": [[number, number], [number, number], [number, number], [number, number]]
-|}
+}
 
-export type ImageSourceSpecification = {|
+export type ImageSourceSpecification = {
     "type": "image",
     "url"?: string,
     "coordinates": [[number, number], [number, number], [number, number], [number, number]]
-|}
+}
 
-export type ModelSourceSpecification = {|
+export type ModelSourceSpecification = {
     "type": "model" | "batched-model",
     "maxzoom"?: number,
     "minzoom"?: number,
     "tiles"?: Array<string>
-|}
+}
 
 export type SourceSpecification =
     | VectorSourceSpecification
@@ -267,20 +290,20 @@ export type SourceSpecification =
 
 export type ModelSpecification = string;
 
-export type AmbientLightSpecification = {|
+export type AmbientLightSpecification = {
     "id": string,
-    "properties"?: {|
+    "properties"?: {
         "color"?: PropertyValueSpecification<ColorSpecification>,
         "color-transition"?: TransitionSpecification,
         "intensity"?: PropertyValueSpecification<number>,
         "intensity-transition"?: TransitionSpecification
-    |},
+    },
     "type": "ambient"
-|}
+}
 
-export type DirectionalLightSpecification = {|
+export type DirectionalLightSpecification = {
     "id": string,
-    "properties"?: {|
+    "properties"?: {
         "direction"?: PropertyValueSpecification<[number, number]>,
         "direction-transition"?: TransitionSpecification,
         "color"?: PropertyValueSpecification<ColorSpecification>,
@@ -290,13 +313,13 @@ export type DirectionalLightSpecification = {|
         "cast-shadows"?: ExpressionSpecification,
         "shadow-intensity"?: PropertyValueSpecification<number>,
         "shadow-intensity-transition"?: TransitionSpecification
-    |},
+    },
     "type": "directional"
-|}
+}
 
-export type FlatLightSpecification = {|
+export type FlatLightSpecification = {
     "id": string,
-    "properties"?: {|
+    "properties"?: {
         "anchor"?: PropertyValueSpecification<"map" | "viewport">,
         "position"?: PropertyValueSpecification<[number, number, number]>,
         "position-transition"?: TransitionSpecification,
@@ -304,30 +327,30 @@ export type FlatLightSpecification = {|
         "color-transition"?: TransitionSpecification,
         "intensity"?: PropertyValueSpecification<number>,
         "intensity-transition"?: TransitionSpecification
-    |},
+    },
     "type": "flat"
-|}
+}
 
 export type LightsSpecification =
     | AmbientLightSpecification
     | DirectionalLightSpecification
     | FlatLightSpecification;
 
-export type FillLayerSpecification = {|
+export type FillLayerSpecification = {
     "id": string,
     "type": "fill",
-    "metadata"?: mixed,
+    "metadata"?: unknown,
     "source": string,
     "source-layer"?: string,
     "slot"?: string,
     "minzoom"?: number,
     "maxzoom"?: number,
     "filter"?: FilterSpecification,
-    "layout"?: {|
+    "layout"?: {
         "fill-sort-key"?: DataDrivenPropertyValueSpecification<number>,
-        "visibility"?: ExpressionSpecification
-    |},
-    "paint"?: {|
+        "visibility"?: "visible" | "none" | ExpressionSpecification
+    },
+    "paint"?: {
         "fill-antialias"?: PropertyValueSpecification<boolean>,
         "fill-opacity"?: DataDrivenPropertyValueSpecification<number>,
         "fill-opacity-transition"?: TransitionSpecification,
@@ -341,28 +364,42 @@ export type FillLayerSpecification = {|
         "fill-pattern"?: DataDrivenPropertyValueSpecification<ResolvedImageSpecification>,
         "fill-emissive-strength"?: PropertyValueSpecification<number>,
         "fill-emissive-strength-transition"?: TransitionSpecification
-    |}
-|}
+    }
+}
+
+/**
+ * @deprecated Use `FillLayerSpecification['layout']` instead.
+ */
+export type FillLayout = FillLayerSpecification['layout'];
+
+/**
+ * @deprecated Use `FillLayerSpecification['paint']` instead.
+ */
+export type FillPaint = FillLayerSpecification['paint'];
 
-export type LineLayerSpecification = {|
+export type LineLayerSpecification = {
     "id": string,
     "type": "line",
-    "metadata"?: mixed,
+    "metadata"?: unknown,
     "source": string,
     "source-layer"?: string,
     "slot"?: string,
     "minzoom"?: number,
     "maxzoom"?: number,
     "filter"?: FilterSpecification,
-    "layout"?: {|
+    "layout"?: {
         "line-cap"?: DataDrivenPropertyValueSpecification<"butt" | "round" | "square">,
         "line-join"?: DataDrivenPropertyValueSpecification<"bevel" | "round" | "miter" | "none">,
         "line-miter-limit"?: PropertyValueSpecification<number>,
         "line-round-limit"?: PropertyValueSpecification<number>,
         "line-sort-key"?: DataDrivenPropertyValueSpecification<number>,
-        "visibility"?: ExpressionSpecification
-    |},
-    "paint"?: {|
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
+        "line-z-offset"?: DataDrivenPropertyValueSpecification<number>,
+        "visibility"?: "visible" | "none" | ExpressionSpecification
+    },
+    "paint"?: {
         "line-opacity"?: DataDrivenPropertyValueSpecification<number>,
         "line-opacity-transition"?: TransitionSpecification,
         "line-color"?: DataDrivenPropertyValueSpecification<ColorSpecification>,
@@ -382,26 +419,44 @@ export type LineLayerSpecification = {|
         "line-pattern"?: DataDrivenPropertyValueSpecification<ResolvedImageSpecification>,
         "line-gradient"?: ExpressionSpecification,
         "line-trim-offset"?: [number, number],
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
+        "line-trim-fade-range"?: PropertyValueSpecification<[number, number]>,
+        "line-trim-color"?: PropertyValueSpecification<ColorSpecification>,
+        "line-trim-color-transition"?: TransitionSpecification,
         "line-emissive-strength"?: PropertyValueSpecification<number>,
         "line-emissive-strength-transition"?: TransitionSpecification,
         "line-border-width"?: DataDrivenPropertyValueSpecification<number>,
         "line-border-width-transition"?: TransitionSpecification,
         "line-border-color"?: DataDrivenPropertyValueSpecification<ColorSpecification>,
-        "line-border-color-transition"?: TransitionSpecification
-    |}
-|}
+        "line-border-color-transition"?: TransitionSpecification,
+        "line-occlusion-opacity"?: PropertyValueSpecification<number>,
+        "line-occlusion-opacity-transition"?: TransitionSpecification
+    }
+}
+
+/**
+ * @deprecated Use `LineLayerSpecification['layout']` instead.
+ */
+export type LineLayout = LineLayerSpecification['layout'];
+
+/**
+ * @deprecated Use `LineLayerSpecification['paint']` instead.
+ */
+export type LinePaint = LineLayerSpecification['paint'];
 
-export type SymbolLayerSpecification = {|
+export type SymbolLayerSpecification = {
     "id": string,
     "type": "symbol",
-    "metadata"?: mixed,
+    "metadata"?: unknown,
     "source": string,
     "source-layer"?: string,
     "slot"?: string,
     "minzoom"?: number,
     "maxzoom"?: number,
     "filter"?: FilterSpecification,
-    "layout"?: {|
+    "layout"?: {
         "symbol-placement"?: PropertyValueSpecification<"point" | "line" | "line-center">,
         "symbol-spacing"?: PropertyValueSpecification<number>,
         "symbol-avoid-edges"?: PropertyValueSpecification<boolean>,
@@ -444,11 +499,13 @@ export type SymbolLayerSpecification = {|
         "text-allow-overlap"?: PropertyValueSpecification<boolean>,
         "text-ignore-placement"?: PropertyValueSpecification<boolean>,
         "text-optional"?: PropertyValueSpecification<boolean>,
-        "visibility"?: ExpressionSpecification
-    |},
-    "paint"?: {|
+        "visibility"?: "visible" | "none" | ExpressionSpecification
+    },
+    "paint"?: {
         "icon-opacity"?: DataDrivenPropertyValueSpecification<number>,
         "icon-opacity-transition"?: TransitionSpecification,
+        "icon-occlusion-opacity"?: DataDrivenPropertyValueSpecification<number>,
+        "icon-occlusion-opacity-transition"?: TransitionSpecification,
         "icon-emissive-strength"?: DataDrivenPropertyValueSpecification<number>,
         "icon-emissive-strength-transition"?: TransitionSpecification,
         "text-emissive-strength"?: DataDrivenPropertyValueSpecification<number>,
@@ -468,6 +525,8 @@ export type SymbolLayerSpecification = {|
         "icon-image-cross-fade-transition"?: TransitionSpecification,
         "text-opacity"?: DataDrivenPropertyValueSpecification<number>,
         "text-opacity-transition"?: TransitionSpecification,
+        "text-occlusion-opacity"?: DataDrivenPropertyValueSpecification<number>,
+        "text-occlusion-opacity-transition"?: TransitionSpecification,
         "text-color"?: DataDrivenPropertyValueSpecification<ColorSpecification>,
         "text-color-transition"?: TransitionSpecification,
         "text-halo-color"?: DataDrivenPropertyValueSpecification<ColorSpecification>,
@@ -483,24 +542,34 @@ export type SymbolLayerSpecification = {|
         "icon-color-contrast"?: ExpressionSpecification,
         "icon-color-brightness-min"?: ExpressionSpecification,
         "icon-color-brightness-max"?: ExpressionSpecification
-    |}
-|}
+    }
+}
+
+/**
+ * @deprecated Use `SymbolLayerSpecification['layout']` instead.
+ */
+export type SymbolLayout = SymbolLayerSpecification['layout'];
+
+/**
+ * @deprecated Use `SymbolLayerSpecification['paint']` instead.
+ */
+export type SymbolPaint = SymbolLayerSpecification['paint'];
 
-export type CircleLayerSpecification = {|
+export type CircleLayerSpecification = {
     "id": string,
     "type": "circle",
-    "metadata"?: mixed,
+    "metadata"?: unknown,
     "source": string,
     "source-layer"?: string,
     "slot"?: string,
     "minzoom"?: number,
     "maxzoom"?: number,
     "filter"?: FilterSpecification,
-    "layout"?: {|
+    "layout"?: {
         "circle-sort-key"?: DataDrivenPropertyValueSpecification<number>,
-        "visibility"?: ExpressionSpecification
-    |},
-    "paint"?: {|
+        "visibility"?: "visible" | "none" | ExpressionSpecification
+    },
+    "paint"?: {
         "circle-radius"?: DataDrivenPropertyValueSpecification<number>,
         "circle-radius-transition"?: TransitionSpecification,
         "circle-color"?: DataDrivenPropertyValueSpecification<ColorSpecification>,
@@ -522,23 +591,33 @@ export type CircleLayerSpecification = {|
         "circle-stroke-opacity-transition"?: TransitionSpecification,
         "circle-emissive-strength"?: PropertyValueSpecification<number>,
         "circle-emissive-strength-transition"?: TransitionSpecification
-    |}
-|}
+    }
+}
+
+/**
+ * @deprecated Use `CircleLayerSpecification['layout']` instead.
+ */
+export type CircleLayout = CircleLayerSpecification['layout'];
+
+/**
+ * @deprecated Use `CircleLayerSpecification['paint']` instead.
+ */
+export type CirclePaint = CircleLayerSpecification['paint'];
 
-export type HeatmapLayerSpecification = {|
+export type HeatmapLayerSpecification = {
     "id": string,
     "type": "heatmap",
-    "metadata"?: mixed,
+    "metadata"?: unknown,
     "source": string,
     "source-layer"?: string,
     "slot"?: string,
     "minzoom"?: number,
     "maxzoom"?: number,
     "filter"?: FilterSpecification,
-    "layout"?: {|
-        "visibility"?: ExpressionSpecification
-    |},
-    "paint"?: {|
+    "layout"?: {
+        "visibility"?: "visible" | "none" | ExpressionSpecification
+    },
+    "paint"?: {
         "heatmap-radius"?: DataDrivenPropertyValueSpecification<number>,
         "heatmap-radius-transition"?: TransitionSpecification,
         "heatmap-weight"?: DataDrivenPropertyValueSpecification<number>,
@@ -547,24 +626,37 @@ export type HeatmapLayerSpecification = {|
         "heatmap-color"?: ExpressionSpecification,
         "heatmap-opacity"?: PropertyValueSpecification<number>,
         "heatmap-opacity-transition"?: TransitionSpecification
-    |}
-|}
+    }
+}
+
+/**
+ * @deprecated Use `HeatmapLayerSpecification['layout']` instead.
+ */
+export type HeatmapLayout = HeatmapLayerSpecification['layout'];
+
+/**
+ * @deprecated Use `HeatmapLayerSpecification['paint']` instead.
+ */
+export type HeatmapPaint = HeatmapLayerSpecification['paint'];
 
-export type FillExtrusionLayerSpecification = {|
+export type FillExtrusionLayerSpecification = {
     "id": string,
     "type": "fill-extrusion",
-    "metadata"?: mixed,
+    "metadata"?: unknown,
     "source": string,
     "source-layer"?: string,
     "slot"?: string,
     "minzoom"?: number,
     "maxzoom"?: number,
     "filter"?: FilterSpecification,
-    "layout"?: {|
-        "visibility"?: ExpressionSpecification,
+    "layout"?: {
+        "visibility"?: "visible" | "none" | ExpressionSpecification,
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
         "fill-extrusion-edge-radius"?: ExpressionSpecification
-    |},
-    "paint"?: {|
+    },
+    "paint"?: {
         "fill-extrusion-opacity"?: PropertyValueSpecification<number>,
         "fill-extrusion-opacity-transition"?: TransitionSpecification,
         "fill-extrusion-color"?: DataDrivenPropertyValueSpecification<ColorSpecification>,
@@ -600,27 +692,40 @@ export type FillExtrusionLayerSpecification = {|
         "fill-extrusion-flood-light-ground-attenuation-transition"?: TransitionSpecification,
         "fill-extrusion-vertical-scale"?: PropertyValueSpecification<number>,
         "fill-extrusion-vertical-scale-transition"?: TransitionSpecification,
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
         "fill-extrusion-rounded-roof"?: PropertyValueSpecification<boolean>,
         "fill-extrusion-cutoff-fade-range"?: ExpressionSpecification,
         "fill-extrusion-emissive-strength"?: PropertyValueSpecification<number>,
         "fill-extrusion-emissive-strength-transition"?: TransitionSpecification
-    |}
-|}
+    }
+}
+
+/**
+ * @deprecated Use `FillExtrusionLayerSpecification['layout']` instead.
+ */
+export type FillExtrusionLayout = FillExtrusionLayerSpecification['layout'];
+
+/**
+ * @deprecated Use `FillExtrusionLayerSpecification['paint']` instead.
+ */
+export type FillExtrusionPaint = FillExtrusionLayerSpecification['paint'];
 
-export type RasterLayerSpecification = {|
+export type RasterLayerSpecification = {
     "id": string,
     "type": "raster",
-    "metadata"?: mixed,
+    "metadata"?: unknown,
     "source": string,
     "source-layer"?: string,
     "slot"?: string,
     "minzoom"?: number,
     "maxzoom"?: number,
     "filter"?: FilterSpecification,
-    "layout"?: {|
-        "visibility"?: ExpressionSpecification
-    |},
-    "paint"?: {|
+    "layout"?: {
+        "visibility"?: "visible" | "none" | ExpressionSpecification
+    },
+    "paint"?: {
         "raster-opacity"?: PropertyValueSpecification<number>,
         "raster-opacity-transition"?: TransitionSpecification,
         "raster-color"?: ExpressionSpecification,
@@ -642,26 +747,39 @@ export type RasterLayerSpecification = {|
         "raster-fade-duration"?: PropertyValueSpecification<number>,
         "raster-emissive-strength"?: PropertyValueSpecification<number>,
         "raster-emissive-strength-transition"?: TransitionSpecification,
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
         "raster-array-band"?: string,
         "raster-elevation"?: PropertyValueSpecification<number>,
         "raster-elevation-transition"?: TransitionSpecification
-    |}
-|}
+    }
+}
+
+/**
+ * @deprecated Use `RasterLayerSpecification['layout']` instead.
+ */
+export type RasterLayout = RasterLayerSpecification['layout'];
+
+/**
+ * @deprecated Use `RasterLayerSpecification['paint']` instead.
+ */
+export type RasterPaint = RasterLayerSpecification['paint'];
 
-export type RasterParticleLayerSpecification = {|
+export type RasterParticleLayerSpecification = {
     "id": string,
     "type": "raster-particle",
-    "metadata"?: mixed,
+    "metadata"?: unknown,
     "source": string,
     "source-layer"?: string,
     "slot"?: string,
     "minzoom"?: number,
     "maxzoom"?: number,
     "filter"?: FilterSpecification,
-    "layout"?: {|
-        "visibility"?: ExpressionSpecification
-    |},
-    "paint"?: {|
+    "layout"?: {
+        "visibility"?: "visible" | "none" | ExpressionSpecification
+    },
+    "paint"?: {
         "raster-particle-array-band"?: string,
         "raster-particle-count"?: number,
         "raster-particle-color"?: ExpressionSpecification,
@@ -671,23 +789,33 @@ export type RasterParticleLayerSpecification = {|
         "raster-particle-fade-opacity-factor"?: PropertyValueSpecification<number>,
         "raster-particle-fade-opacity-factor-transition"?: TransitionSpecification,
         "raster-particle-reset-rate-factor"?: number
-    |}
-|}
+    }
+}
+
+/**
+ * @deprecated Use `RasterParticleLayerSpecification['layout']` instead.
+ */
+export type RasterParticleLayout = RasterParticleLayerSpecification['layout'];
+
+/**
+ * @deprecated Use `RasterParticleLayerSpecification['paint']` instead.
+ */
+export type RasterParticlePaint = RasterParticleLayerSpecification['paint'];
 
-export type HillshadeLayerSpecification = {|
+export type HillshadeLayerSpecification = {
     "id": string,
     "type": "hillshade",
-    "metadata"?: mixed,
+    "metadata"?: unknown,
     "source": string,
     "source-layer"?: string,
     "slot"?: string,
     "minzoom"?: number,
     "maxzoom"?: number,
     "filter"?: FilterSpecification,
-    "layout"?: {|
-        "visibility"?: ExpressionSpecification
-    |},
-    "paint"?: {|
+    "layout"?: {
+        "visibility"?: "visible" | "none" | ExpressionSpecification
+    },
+    "paint"?: {
         "hillshade-illumination-direction"?: PropertyValueSpecification<number>,
         "hillshade-illumination-anchor"?: PropertyValueSpecification<"map" | "viewport">,
         "hillshade-exaggeration"?: PropertyValueSpecification<number>,
@@ -700,24 +828,34 @@ export type HillshadeLayerSpecification = {|
         "hillshade-accent-color-transition"?: TransitionSpecification,
         "hillshade-emissive-strength"?: PropertyValueSpecification<number>,
         "hillshade-emissive-strength-transition"?: TransitionSpecification
-    |}
-|}
+    }
+}
+
+/**
+ * @deprecated Use `HillshadeLayerSpecification['layout']` instead.
+ */
+export type HillshadeLayout = HillshadeLayerSpecification['layout'];
 
-export type ModelLayerSpecification = {|
+/**
+ * @deprecated Use `HillshadeLayerSpecification['paint']` instead.
+ */
+export type HillshadePaint = HillshadeLayerSpecification['paint'];
+
+export type ModelLayerSpecification = {
     "id": string,
     "type": "model",
-    "metadata"?: mixed,
+    "metadata"?: unknown,
     "source": string,
     "source-layer"?: string,
     "slot"?: string,
     "minzoom"?: number,
     "maxzoom"?: number,
     "filter"?: FilterSpecification,
-    "layout"?: {|
-        "visibility"?: ExpressionSpecification,
+    "layout"?: {
+        "visibility"?: "visible" | "none" | ExpressionSpecification,
         "model-id"?: DataDrivenPropertyValueSpecification<string>
-    |},
-    "paint"?: {|
+    },
+    "paint"?: {
         "model-opacity"?: PropertyValueSpecification<number>,
         "model-opacity-transition"?: TransitionSpecification,
         "model-rotation"?: DataDrivenPropertyValueSpecification<[number, number, number]>,
@@ -743,20 +881,33 @@ export type ModelLayerSpecification = {|
         "model-height-based-emissive-strength-multiplier-transition"?: TransitionSpecification,
         "model-cutoff-fade-range"?: ExpressionSpecification,
         "model-front-cutoff"?: PropertyValueSpecification<[number, number, number]>
-    |}
-|}
+    }
+}
+
+/**
+ * @deprecated Use `ModelLayerSpecification['layout']` instead.
+ */
+export type ModelLayout = ModelLayerSpecification['layout'];
 
-export type BackgroundLayerSpecification = {|
+/**
+ * @deprecated Use `ModelLayerSpecification['paint']` instead.
+ */
+export type ModelPaint = ModelLayerSpecification['paint'];
+
+export type BackgroundLayerSpecification = {
     "id": string,
     "type": "background",
-    "metadata"?: mixed,
+    "metadata"?: unknown,
+    "source"?: never,
+    "source-layer"?: never,
     "slot"?: string,
     "minzoom"?: number,
     "maxzoom"?: number,
-    "layout"?: {|
-        "visibility"?: ExpressionSpecification
-    |},
-    "paint"?: {|
+    "filter"?: never,
+    "layout"?: {
+        "visibility"?: "visible" | "none" | ExpressionSpecification
+    },
+    "paint"?: {
         "background-color"?: PropertyValueSpecification<ColorSpecification>,
         "background-color-transition"?: TransitionSpecification,
         "background-pattern"?: PropertyValueSpecification<ResolvedImageSpecification>,
@@ -764,20 +915,33 @@ export type BackgroundLayerSpecification = {|
         "background-opacity-transition"?: TransitionSpecification,
         "background-emissive-strength"?: PropertyValueSpecification<number>,
         "background-emissive-strength-transition"?: TransitionSpecification
-    |}
-|}
+    }
+}
+
+/**
+ * @deprecated Use `BackgroundLayerSpecification['layout']` instead.
+ */
+export type BackgroundLayout = BackgroundLayerSpecification['layout'];
 
-export type SkyLayerSpecification = {|
+/**
+ * @deprecated Use `BackgroundLayerSpecification['paint']` instead.
+ */
+export type BackgroundPaint = BackgroundLayerSpecification['paint'];
+
+export type SkyLayerSpecification = {
     "id": string,
     "type": "sky",
-    "metadata"?: mixed,
+    "metadata"?: unknown,
+    "source"?: never,
+    "source-layer"?: never,
     "slot"?: string,
     "minzoom"?: number,
     "maxzoom"?: number,
-    "layout"?: {|
-        "visibility"?: ExpressionSpecification
-    |},
-    "paint"?: {|
+    "filter"?: never,
+    "layout"?: {
+        "visibility"?: "visible" | "none" | ExpressionSpecification
+    },
+    "paint"?: {
         "sky-type"?: PropertyValueSpecification<"gradient" | "atmosphere">,
         "sky-atmosphere-sun"?: PropertyValueSpecification<[number, number]>,
         "sky-atmosphere-sun-intensity"?: number,
@@ -788,15 +952,56 @@ export type SkyLayerSpecification = {|
         "sky-atmosphere-color"?: ColorSpecification,
         "sky-opacity"?: PropertyValueSpecification<number>,
         "sky-opacity-transition"?: TransitionSpecification
-    |}
-|}
+    }
+}
+
+/**
+ * @deprecated Use `SkyLayerSpecification['layout']` instead.
+ */
+export type SkyLayout = SkyLayerSpecification['layout'];
 
-export type SlotLayerSpecification = {|
+/**
+ * @deprecated Use `SkyLayerSpecification['paint']` instead.
+ */
+export type SkyPaint = SkyLayerSpecification['paint'];
+
+export type SlotLayerSpecification = {
     "id": string,
     "type": "slot",
-    "metadata"?: mixed,
-    "slot"?: string
-|}
+    "metadata"?: unknown,
+    "source"?: never,
+    "source-layer"?: never,
+    "slot"?: string,
+    "minzoom"?: never,
+    "maxzoom"?: never,
+    "filter"?: never,
+    "layout"?: never,
+    "paint"?: never
+}
+
+export type ClipLayerSpecification = {
+    "id": string,
+    "type": "clip",
+    "metadata"?: unknown,
+    "source": string,
+    "source-layer"?: string,
+    "slot"?: string,
+    "minzoom"?: number,
+    "maxzoom"?: number,
+    "filter"?: FilterSpecification,
+    "layout"?: {
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
+        "clip-layer-types"?: ExpressionSpecification
+    },
+    "paint"?: never
+}
+
+/**
+ * @deprecated Use `ClipLayerSpecification['layout']` instead.
+ */
+export type ClipLayout = ClipLayerSpecification['layout'];
 
 export type LayerSpecification =
     | FillLayerSpecification
@@ -811,5 +1016,162 @@ export type LayerSpecification =
     | ModelLayerSpecification
     | BackgroundLayerSpecification
     | SkyLayerSpecification
-    | SlotLayerSpecification;
+    | SlotLayerSpecification
+    | ClipLayerSpecification;
+
+// Aliases for easier migration from @types/mapbox-gl
+
+export type Layer = Pick<
+    LayerSpecification,
+    | "id"
+    | "type"
+    | "source"
+    | "source-layer"
+    | "slot"
+    | "filter"
+    | "layout"
+    | "paint"
+    | "minzoom"
+    | "maxzoom"
+    | "metadata"
+>;
+
+/**
+ * @deprecated Use `StyleSpecification` instead.
+ */
+export type Style = StyleSpecification;
+
+/**
+ * @deprecated Use `LayerSpecification` instead.
+ */
+export type AnyLayer = LayerSpecification;
+
+/**
+ * @deprecated Use `FillLayerSpecification` instead.
+ */
+export type FillLayer = FillLayerSpecification;
+
+/**
+ * @deprecated Use `LineLayerSpecification` instead.
+ */
+export type LineLayer = LineLayerSpecification;
+
+/**
+ * @deprecated Use `SymbolLayerSpecification` instead.
+ */
+export type SymbolLayer = SymbolLayerSpecification;
+
+/**
+ * @deprecated Use `CircleLayerSpecification` instead.
+ */
+export type CircleLayer = CircleLayerSpecification;
+
+/**
+ * @deprecated Use `HeatmapLayerSpecification` instead.
+ */
+export type HeatmapLayer = HeatmapLayerSpecification;
+
+/**
+ * @deprecated Use `FillExtrusionLayerSpecification` instead.
+ */
+export type FillExtrusionLayer = FillExtrusionLayerSpecification;
+
+/**
+ * @deprecated Use `RasterLayerSpecification` instead.
+ */
+export type RasterLayer = RasterLayerSpecification;
+
+/**
+ * @deprecated Use `RasterParticleLayerSpecification` instead.
+ */
+export type RasterParticleLayer = RasterParticleLayerSpecification;
+
+/**
+ * @deprecated Use `HillshadeLayerSpecification` instead.
+ */
+export type HillshadeLayer = HillshadeLayerSpecification;
+
+/**
+ * @deprecated Use `ModelLayerSpecification` instead.
+ */
+export type ModelLayer = ModelLayerSpecification;
+
+/**
+ * @deprecated Use `BackgroundLayerSpecification` instead.
+ */
+export type BackgroundLayer = BackgroundLayerSpecification;
+
+/**
+ * @deprecated Use `SkyLayerSpecification` instead.
+ */
+export type SkyLayer = SkyLayerSpecification;
+
+/**
+ * @deprecated Use `SlotLayerSpecification` instead.
+ */
+export type SlotLayer = SlotLayerSpecification;
+
+/**
+ * @deprecated Use `ClipLayerSpecification` instead.
+ */
+export type ClipLayer = ClipLayerSpecification;
+
+/**
+ * @deprecated
+ */
+export type AnyLayout =
+    | FillLayout
+    | LineLayout
+    | SymbolLayout
+    | CircleLayout
+    | HeatmapLayout
+    | FillExtrusionLayout
+    | RasterLayout
+    | RasterParticleLayout
+    | HillshadeLayout
+    | ModelLayout
+    | BackgroundLayout
+    | SkyLayout
+    | ClipLayout;
+
+/**
+ * @deprecated
+ */
+export type AnyPaint =
+    | FillPaint
+    | LinePaint
+    | SymbolPaint
+    | CirclePaint
+    | HeatmapPaint
+    | FillExtrusionPaint
+    | RasterPaint
+    | RasterParticlePaint
+    | HillshadePaint
+    | ModelPaint
+    | BackgroundPaint
+    | SkyPaint;
+
+/**
+ * @deprecated Use `ExpressionSpecification` instead.
+ */
+export type Expression = ExpressionSpecification;
+
+/**
+ * @deprecated Use `TransitionSpecification` instead.
+ */
+export type Transition = TransitionSpecification;
+
+/**
+ * @deprecated Use `SourceSpecification` instead.
+ */
+export type AnySourceData = SourceSpecification;
+
+/**
+ * @deprecated Use `SourcesSpecification` instead.
+ */
+export type Sources = SourcesSpecification;
 
+/**
+ * @deprecated Use `ProjectionSpecification` instead.
+ */
+export type Projection = ProjectionSpecification;