@mapbox/mapbox-gl-style-spec 14.17.0 → 14.18.0-beta.2

package/dist/index.d.ts

@@ -24,13 +24,16 @@ declare const _default: StyleReference;
  * fs.writeFileSync('./dest.min.json', format(style, 0));
  */
 export declare function format(style: any, space?: number): string;
-type ColorSpecification = string;
-type FormattedSpecification = string;
-type ResolvedImageSpecification = string;
-type PromoteIdSpecification = {
+type UnionToIntersection<U> = (U extends unknown ? (k: U) => void : never) extends (k: infer I) => void ? {
+	[K in keyof I]: I[K];
+} : never;
+export type ColorSpecification = string;
+export type FormattedSpecification = string;
+export type ResolvedImageSpecification = string;
+export type PromoteIdSpecification = {
 	[_: string]: string | ExpressionSpecification;
 } | string | ExpressionSpecification;
-type FilterSpecification = ExpressionSpecification | [
+export type FilterSpecification = ExpressionSpecification | [
 	"has",
 	string
 ] | [
@@ -61,22 +64,25 @@ type FilterSpecification = ExpressionSpecification | [
 	string,
 	string | number | boolean
 ] | Array<string | FilterSpecification>;
-type TransitionSpecification = {
+export type TransitionSpecification = {
 	duration?: number;
 	delay?: number;
 };
-type PropertyFunctionStop<T> = [
+export type PropertyFunctionStop<T> = [
 	number,
 	T
 ];
-type ZoomAndPropertyFunctionStop<T> = [
+export type ZoomAndPropertyFunctionStop<T> = [
 	{
 		zoom: number;
 		value: string | number | boolean;
 	},
 	T
 ];
-type FunctionSpecification<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;
@@ -84,7 +90,7 @@ type FunctionSpecification<T> = {
 	colorSpace?: "rgb" | "lab" | "hcl";
 	default?: T;
 };
-type CameraFunctionSpecification<T> = {
+export type CameraFunctionSpecification<T> = {
 	type: "exponential";
 	stops: Array<[
 		number,
@@ -97,7 +103,7 @@ type CameraFunctionSpecification<T> = {
 		T
 	]>;
 };
-type SourceFunctionSpecification<T> = {
+export type SourceFunctionSpecification<T> = {
 	type: "exponential";
 	stops: Array<[
 		number,
@@ -126,7 +132,7 @@ type SourceFunctionSpecification<T> = {
 	property: string;
 	default?: T;
 };
-type CompositeFunctionSpecification<T> = {
+export type CompositeFunctionSpecification<T> = {
 	type: "exponential";
 	stops: Array<[
 		{
@@ -160,13 +166,13 @@ type CompositeFunctionSpecification<T> = {
 	property: string;
 	default?: T;
 };
-type ExpressionSpecification = [
+export type ExpressionSpecification = [
 	string,
 	...any[]
 ];
-type PropertyValueSpecification<T> = T | CameraFunctionSpecification<T> | ExpressionSpecification;
-type DataDrivenPropertyValueSpecification<T> = T | FunctionSpecification<T> | CameraFunctionSpecification<T> | SourceFunctionSpecification<T> | CompositeFunctionSpecification<T> | ExpressionSpecification | (T extends Array<infer U> ? Array<U | ExpressionSpecification> : never);
-type StyleSpecification = {
+export type PropertyValueSpecification<T> = T | CameraFunctionSpecification<T> | ExpressionSpecification;
+export type DataDrivenPropertyValueSpecification<T> = T | FunctionSpecification<T> | CameraFunctionSpecification<T> | SourceFunctionSpecification<T> | CompositeFunctionSpecification<T> | ExpressionSpecification | (T extends Array<infer U> ? Array<U | ExpressionSpecification> : never);
+export type StyleSpecification = {
 	"version": 8;
 	"fragment"?: boolean;
 	"name"?: string;
@@ -211,35 +217,35 @@ type StyleSpecification = {
 	 */
 	"featuresets"?: FeaturesetsSpecification;
 };
-type SourcesSpecification = {
+export type SourcesSpecification = {
 	[_: string]: SourceSpecification;
 };
-type ModelsSpecification = {
+export type ModelsSpecification = {
 	[_: string]: ModelSpecification;
 };
-type ModelNodeOverrideSpecification = {
+export type ModelNodeOverrideSpecification = {
 	"orientation"?: [
 		number,
 		number,
 		number
 	];
 };
-type ModelNodeOverridesSpecification = {
+export type ModelNodeOverridesSpecification = {
 	[_: string]: ModelNodeOverrideSpecification;
 };
-type ModelMaterialOverrideSpecification = {
+export type ModelMaterialOverrideSpecification = {
 	"model-color"?: ColorSpecification;
 	"model-color-mix-intensity"?: number;
 	"model-opacity"?: number;
 	"model-emissive-strength"?: number;
 };
-type ModelMaterialOverridesSpecification = {
+export type ModelMaterialOverridesSpecification = {
 	[_: string]: ModelMaterialOverrideSpecification;
 };
-type ModelSourceModelsSpecification = {
+export type ModelSourceModelsSpecification = {
 	[_: string]: ModelSourceModelSpecification;
 };
-type ModelSourceModelSpecification = {
+export type ModelSourceModelSpecification = {
 	"uri": string;
 	"position"?: [
 		number,
@@ -256,10 +262,10 @@ type ModelSourceModelSpecification = {
 	"materialOverrideNames"?: Array<string>;
 	"featureProperties"?: unknown;
 };
-type IconsetsSpecification = {
+export type IconsetsSpecification = {
 	[_: string]: IconsetSpecification;
 };
-type LightSpecification = {
+export type LightSpecification = {
 	"anchor"?: PropertyValueSpecification<"map" | "viewport">;
 	"position"?: PropertyValueSpecification<[
 		number,
@@ -273,12 +279,16 @@ type LightSpecification = {
 	"intensity"?: PropertyValueSpecification<number>;
 	"intensity-transition"?: TransitionSpecification;
 };
-type TerrainSpecification = {
+export type TerrainSpecification = {
 	"source": string;
 	"exaggeration"?: PropertyValueSpecification<number>;
 	"exaggeration-transition"?: TransitionSpecification;
 };
-type FogSpecification = {
+export type TerrainSpecificationUpdate = {
+	"exaggeration"?: PropertyValueSpecification<number>;
+	"exaggeration-transition"?: TransitionSpecification;
+};
+export type FogSpecification = {
 	"range"?: PropertyValueSpecification<[
 		number,
 		number
@@ -303,7 +313,7 @@ type FogSpecification = {
 	]>;
 	"vertical-range-transition"?: TransitionSpecification;
 };
-type SnowSpecification = {
+export type SnowSpecification = {
 	/**
 	 * @experimental This property is experimental and subject to change in future versions.
 	 */
@@ -355,7 +365,7 @@ type SnowSpecification = {
 	"flake-size"?: PropertyValueSpecification<number>;
 	"flake-size-transition"?: TransitionSpecification;
 };
-type RainSpecification = {
+export type RainSpecification = {
 	/**
 	 * @experimental This property is experimental and subject to change in future versions.
 	 */
@@ -415,14 +425,14 @@ type RainSpecification = {
 	"distortion-strength"?: PropertyValueSpecification<number>;
 	"distortion-strength-transition"?: TransitionSpecification;
 };
-type CameraSpecification = {
+export type CameraSpecification = {
 	"camera-projection"?: PropertyValueSpecification<"perspective" | "orthographic">;
 	"camera-projection-transition"?: TransitionSpecification;
 };
-type ColorThemeSpecification = {
-	"data"?: ExpressionSpecification;
+export type ColorThemeSpecification = {
+	"data"?: string | ExpressionSpecification;
 };
-type ProjectionSpecification = {
+export type ProjectionSpecification = {
 	"name": "albers" | "equalEarth" | "equirectangular" | "lambertConformalConic" | "mercator" | "naturalEarth" | "winkelTripel" | "globe";
 	"center"?: [
 		number,
@@ -433,20 +443,20 @@ type ProjectionSpecification = {
 		number
 	];
 };
-type ImportSpecification = {
+export type ImportSpecification = {
 	"id": string;
 	"url": string;
 	"config"?: ConfigSpecification;
 	"data"?: StyleSpecification;
 	"color-theme"?: ColorThemeSpecification | null | undefined;
 };
-type IndoorSpecification = {
+export type IndoorSpecification = {
 	/**
 	 * @experimental This property is experimental and subject to change in future versions.
 	 */
 	[_: string]: IndoorSourceSpecification;
 };
-type IndoorSourceSpecification = {
+export type IndoorSourceSpecification = {
 	/**
 	 * @experimental This property is experimental and subject to change in future versions.
 	 */
@@ -456,14 +466,14 @@ type IndoorSourceSpecification = {
 	 */
 	"sourceLayers"?: Array<string>;
 };
-type ConfigSpecification = {
+export type ConfigSpecification = {
 	[_: string]: unknown;
 };
-type SchemaSpecification = {
+export type SchemaSpecification = {
 	[_: string]: OptionSpecification;
 };
-type OptionSpecification = {
-	"default": ExpressionSpecification;
+export type OptionSpecification = {
+	"default": unknown | ExpressionSpecification;
 	"type"?: "string" | "number" | "boolean" | "color";
 	"array"?: boolean;
 	"minValue"?: number;
@@ -472,10 +482,16 @@ type OptionSpecification = {
 	"values"?: Array<unknown>;
 	"metadata"?: unknown;
 };
-type FeaturesetsSpecification = {
+/**
+ * @experimental This is experimental and subject to change in future versions.
+ */
+export type FeaturesetsSpecification = {
 	[_: string]: FeaturesetSpecification;
 };
-type FeaturesetSpecification = {
+/**
+ * @experimental This is experimental and subject to change in future versions.
+ */
+export type FeaturesetSpecification = {
 	/**
 	 * @experimental This property is experimental and subject to change in future versions.
 	 */
@@ -485,7 +501,10 @@ type FeaturesetSpecification = {
 	 */
 	"selectors"?: Array<SelectorSpecification>;
 };
-type SelectorSpecification = {
+/**
+ * @experimental This is experimental and subject to change in future versions.
+ */
+export type SelectorSpecification = {
 	/**
 	 * @experimental This property is experimental and subject to change in future versions.
 	 */
@@ -503,18 +522,21 @@ type SelectorSpecification = {
 	 */
 	"_uniqueFeatureID"?: boolean;
 };
-type SelectorPropertySpecification = {
+/**
+ * @experimental This is experimental and subject to change in future versions.
+ */
+export type SelectorPropertySpecification = {
 	/**
 	 * @experimental This property is experimental and subject to change in future versions.
 	 */
 	[_: string]: unknown;
 };
-type AppearanceSpecification = {
+export type AppearanceSpecification = {
 	"condition"?: DataDrivenPropertyValueSpecification<boolean>;
 	"name"?: string;
 	"properties"?: unknown;
 };
-type VectorSourceSpecification = {
+export type VectorSourceSpecification = {
 	"type": "vector";
 	"url"?: string;
 	"tiles"?: Array<string>;
@@ -538,7 +560,7 @@ type VectorSourceSpecification = {
 	"volatile"?: boolean;
 	[_: string]: unknown;
 };
-type RasterSourceSpecification = {
+export type RasterSourceSpecification = {
 	"type": "raster";
 	"url"?: string;
 	"tiles"?: Array<string>;
@@ -562,7 +584,7 @@ type RasterSourceSpecification = {
 	"volatile"?: boolean;
 	[_: string]: unknown;
 };
-type RasterDEMSourceSpecification = {
+export type RasterDEMSourceSpecification = {
 	"type": "raster-dem";
 	"url"?: string;
 	"tiles"?: Array<string>;
@@ -586,7 +608,10 @@ type RasterDEMSourceSpecification = {
 	"volatile"?: boolean;
 	[_: string]: unknown;
 };
-type RasterArraySourceSpecification = {
+/**
+ * @experimental This is experimental and subject to change in future versions.
+ */
+export type RasterArraySourceSpecification = {
 	"type": "raster-array";
 	"url"?: string;
 	"tiles"?: Array<string>;
@@ -610,7 +635,7 @@ type RasterArraySourceSpecification = {
 	"volatile"?: boolean;
 	[_: string]: unknown;
 };
-type GeoJSONSourceSpecification = {
+export type GeoJSONSourceSpecification = {
 	"type": "geojson";
 	"data"?: GeoJSON.GeoJSON | string;
 	"maxzoom"?: number;
@@ -629,7 +654,7 @@ type GeoJSONSourceSpecification = {
 	"promoteId"?: PromoteIdSpecification;
 	"dynamic"?: boolean;
 };
-type VideoSourceSpecification = {
+export type VideoSourceSpecification = {
 	"type": "video";
 	"urls": Array<string>;
 	"coordinates": [
@@ -651,7 +676,7 @@ type VideoSourceSpecification = {
 		]
 	];
 };
-type ImageSourceSpecification = {
+export type ImageSourceSpecification = {
 	"type": "image";
 	"url"?: string;
 	"coordinates": [
@@ -673,23 +698,24 @@ type ImageSourceSpecification = {
 		]
 	];
 };
-type ModelSourceSpecification = {
+export type ModelSourceSpecification = {
 	"type": "model" | "batched-model";
+	"url"?: string;
 	"maxzoom"?: number;
 	"minzoom"?: number;
 	"tiles"?: Array<string>;
 	"models"?: ModelSourceModelsSpecification;
 };
-type SourceSpecification = VectorSourceSpecification | RasterSourceSpecification | RasterDEMSourceSpecification | RasterArraySourceSpecification | GeoJSONSourceSpecification | VideoSourceSpecification | ImageSourceSpecification | ModelSourceSpecification;
-type IconsetSpecification = {
+export type SourceSpecification = VectorSourceSpecification | RasterSourceSpecification | RasterDEMSourceSpecification | RasterArraySourceSpecification | GeoJSONSourceSpecification | VideoSourceSpecification | ImageSourceSpecification | ModelSourceSpecification;
+export type IconsetSpecification = {
 	"type": "sprite";
 	"url": string;
 } | {
 	"type": "source";
 	"source": string;
 };
-type ModelSpecification = string;
-type AmbientLightSpecification = {
+export type ModelSpecification = string;
+export type AmbientLightSpecification = {
 	"id": string;
 	"properties"?: {
 		"color"?: PropertyValueSpecification<ColorSpecification>;
@@ -700,7 +726,7 @@ type AmbientLightSpecification = {
 	};
 	"type": "ambient";
 };
-type DirectionalLightSpecification = {
+export type DirectionalLightSpecification = {
 	"id": string;
 	"properties"?: {
 		"direction"?: PropertyValueSpecification<[
@@ -720,10 +746,14 @@ type DirectionalLightSpecification = {
 		"shadow-quality"?: PropertyValueSpecification<number>;
 		"shadow-intensity"?: PropertyValueSpecification<number>;
 		"shadow-intensity-transition"?: TransitionSpecification;
+		/**
+		 * @experimental This property is experimental and subject to change in future versions.
+		 */
+		"shadow-draw-before-layer"?: string;
 	};
 	"type": "directional";
 };
-type FlatLightSpecification = {
+export type FlatLightSpecification = {
 	"id": string;
 	"properties"?: {
 		"anchor"?: PropertyValueSpecification<"map" | "viewport">;
@@ -741,8 +771,8 @@ type FlatLightSpecification = {
 	};
 	"type": "flat";
 };
-type LightsSpecification = AmbientLightSpecification | DirectionalLightSpecification | FlatLightSpecification;
-type FillLayerSpecification = {
+export type LightsSpecification = AmbientLightSpecification | DirectionalLightSpecification | FlatLightSpecification;
+export type FillLayerSpecification = {
 	"id": string;
 	"type": "fill";
 	"metadata"?: unknown;
@@ -807,7 +837,15 @@ type FillLayerSpecification = {
 	 */
 	"appearances"?: Array<AppearanceSpecification>;
 };
-type LineLayerSpecification = {
+/**
+ * @deprecated Use `FillLayerSpecification['layout']` instead.
+ */
+export type FillLayout = FillLayerSpecification["layout"];
+/**
+ * @deprecated Use `FillLayerSpecification['paint']` instead.
+ */
+export type FillPaint = FillLayerSpecification["paint"];
+export type LineLayerSpecification = {
 	"id": string;
 	"type": "line";
 	"metadata"?: unknown;
@@ -834,7 +872,7 @@ type LineLayerSpecification = {
 		/**
 		 * @experimental This property is experimental and subject to change in future versions.
 		 */
-		"line-cross-slope"?: ExpressionSpecification;
+		"line-cross-slope"?: number | ExpressionSpecification;
 		"visibility"?: "visible" | "none" | ExpressionSpecification;
 		/**
 		 * @experimental This property is experimental and subject to change in future versions.
@@ -864,7 +902,7 @@ type LineLayerSpecification = {
 		"line-dasharray"?: DataDrivenPropertyValueSpecification<Array<number>>;
 		"line-pattern"?: DataDrivenPropertyValueSpecification<ResolvedImageSpecification>;
 		"line-pattern-cross-fade"?: PropertyValueSpecification<number>;
-		"line-gradient"?: ExpressionSpecification;
+		"line-gradient"?: ColorSpecification | ExpressionSpecification;
 		"line-gradient-use-theme"?: PropertyValueSpecification<string>;
 		"line-trim-offset"?: [
 			number,
@@ -898,7 +936,15 @@ type LineLayerSpecification = {
 	 */
 	"appearances"?: Array<AppearanceSpecification>;
 };
-type SymbolLayerSpecification = {
+/**
+ * @deprecated Use `LineLayerSpecification['layout']` instead.
+ */
+export type LineLayout = LineLayerSpecification["layout"];
+/**
+ * @deprecated Use `LineLayerSpecification['paint']` instead.
+ */
+export type LinePaint = LineLayerSpecification["paint"];
+export type SymbolLayerSpecification = {
 	"id": string;
 	"type": "symbol";
 	"metadata"?: unknown;
@@ -927,7 +973,10 @@ type SymbolLayerSpecification = {
 		/**
 		 * @experimental This property is experimental and subject to change in future versions.
 		 */
-		"icon-size-scale-range"?: ExpressionSpecification;
+		"icon-size-scale-range"?: [
+			number,
+			number
+		] | ExpressionSpecification;
 		"icon-text-fit"?: DataDrivenPropertyValueSpecification<"none" | "width" | "height" | "both">;
 		"icon-text-fit-padding"?: DataDrivenPropertyValueSpecification<[
 			number,
@@ -954,7 +1003,10 @@ type SymbolLayerSpecification = {
 		/**
 		 * @experimental This property is experimental and subject to change in future versions.
 		 */
-		"text-size-scale-range"?: ExpressionSpecification;
+		"text-size-scale-range"?: [
+			number,
+			number
+		] | ExpressionSpecification;
 		"text-max-width"?: DataDrivenPropertyValueSpecification<number>;
 		"text-line-height"?: DataDrivenPropertyValueSpecification<number>;
 		"text-letter-spacing"?: DataDrivenPropertyValueSpecification<number>;
@@ -1023,10 +1075,10 @@ type SymbolLayerSpecification = {
 		]>;
 		"text-translate-transition"?: TransitionSpecification;
 		"text-translate-anchor"?: PropertyValueSpecification<"map" | "viewport">;
-		"icon-color-saturation"?: ExpressionSpecification;
-		"icon-color-contrast"?: ExpressionSpecification;
-		"icon-color-brightness-min"?: ExpressionSpecification;
-		"icon-color-brightness-max"?: ExpressionSpecification;
+		"icon-color-saturation"?: number | ExpressionSpecification;
+		"icon-color-contrast"?: number | ExpressionSpecification;
+		"icon-color-brightness-min"?: number | ExpressionSpecification;
+		"icon-color-brightness-max"?: number | ExpressionSpecification;
 		/**
 		 * @experimental This property is experimental and subject to change in future versions.
 		 */
@@ -1038,7 +1090,15 @@ type SymbolLayerSpecification = {
 	 */
 	"appearances"?: Array<AppearanceSpecification>;
 };
-type CircleLayerSpecification = {
+/**
+ * @deprecated Use `SymbolLayerSpecification['layout']` instead.
+ */
+export type SymbolLayout = SymbolLayerSpecification["layout"];
+/**
+ * @deprecated Use `SymbolLayerSpecification['paint']` instead.
+ */
+export type SymbolPaint = SymbolLayerSpecification["paint"];
+export type CircleLayerSpecification = {
 	"id": string;
 	"type": "circle";
 	"metadata"?: unknown;
@@ -1089,7 +1149,15 @@ type CircleLayerSpecification = {
 	 */
 	"appearances"?: Array<AppearanceSpecification>;
 };
-type HeatmapLayerSpecification = {
+/**
+ * @deprecated Use `CircleLayerSpecification['layout']` instead.
+ */
+export type CircleLayout = CircleLayerSpecification["layout"];
+/**
+ * @deprecated Use `CircleLayerSpecification['paint']` instead.
+ */
+export type CirclePaint = CircleLayerSpecification["paint"];
+export type HeatmapLayerSpecification = {
 	"id": string;
 	"type": "heatmap";
 	"metadata"?: unknown;
@@ -1108,7 +1176,7 @@ type HeatmapLayerSpecification = {
 		"heatmap-weight"?: DataDrivenPropertyValueSpecification<number>;
 		"heatmap-intensity"?: PropertyValueSpecification<number>;
 		"heatmap-intensity-transition"?: TransitionSpecification;
-		"heatmap-color"?: ExpressionSpecification;
+		"heatmap-color"?: ColorSpecification | ExpressionSpecification;
 		"heatmap-color-use-theme"?: PropertyValueSpecification<string>;
 		"heatmap-opacity"?: PropertyValueSpecification<number>;
 		"heatmap-opacity-transition"?: TransitionSpecification;
@@ -1118,7 +1186,15 @@ type HeatmapLayerSpecification = {
 	 */
 	"appearances"?: Array<AppearanceSpecification>;
 };
-type FillExtrusionLayerSpecification = {
+/**
+ * @deprecated Use `HeatmapLayerSpecification['layout']` instead.
+ */
+export type HeatmapLayout = HeatmapLayerSpecification["layout"];
+/**
+ * @deprecated Use `HeatmapLayerSpecification['paint']` instead.
+ */
+export type HeatmapPaint = HeatmapLayerSpecification["paint"];
+export type FillExtrusionLayerSpecification = {
 	"id": string;
 	"type": "fill-extrusion";
 	"metadata"?: unknown;
@@ -1133,7 +1209,7 @@ type FillExtrusionLayerSpecification = {
 		/**
 		 * @experimental This property is experimental and subject to change in future versions.
 		 */
-		"fill-extrusion-edge-radius"?: ExpressionSpecification;
+		"fill-extrusion-edge-radius"?: number | ExpressionSpecification;
 	};
 	"paint"?: {
 		"fill-extrusion-opacity"?: PropertyValueSpecification<number>;
@@ -1216,7 +1292,7 @@ type FillExtrusionLayerSpecification = {
 		 * @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-cutoff-fade-range"?: number | ExpressionSpecification;
 		"fill-extrusion-emissive-strength"?: DataDrivenPropertyValueSpecification<number>;
 		"fill-extrusion-emissive-strength-transition"?: TransitionSpecification;
 		/**
@@ -1231,7 +1307,15 @@ type FillExtrusionLayerSpecification = {
 	 */
 	"appearances"?: Array<AppearanceSpecification>;
 };
-type BuildingLayerSpecification = {
+/**
+ * @deprecated Use `FillExtrusionLayerSpecification['layout']` instead.
+ */
+export type FillExtrusionLayout = FillExtrusionLayerSpecification["layout"];
+/**
+ * @deprecated Use `FillExtrusionLayerSpecification['paint']` instead.
+ */
+export type FillExtrusionPaint = FillExtrusionLayerSpecification["paint"];
+export type BuildingLayerSpecification = {
 	"id": string;
 	"type": "building";
 	"metadata"?: unknown;
@@ -1265,7 +1349,7 @@ type BuildingLayerSpecification = {
 	"paint"?: {
 		"building-opacity"?: PropertyValueSpecification<number>;
 		"building-opacity-transition"?: TransitionSpecification;
-		"building-ambient-occlusion-intensity"?: ExpressionSpecification;
+		"building-ambient-occlusion-intensity"?: number | ExpressionSpecification;
 		"building-ambient-occlusion-intensity-transition"?: TransitionSpecification;
 		"building-ambient-occlusion-ground-intensity"?: PropertyValueSpecification<number>;
 		"building-ambient-occlusion-ground-intensity-transition"?: TransitionSpecification;
@@ -1280,7 +1364,7 @@ type BuildingLayerSpecification = {
 		"building-color-use-theme"?: PropertyValueSpecification<string>;
 		"building-emissive-strength"?: DataDrivenPropertyValueSpecification<number>;
 		"building-facade-emissive-chance"?: PropertyValueSpecification<number>;
-		"building-cutoff-fade-range"?: ExpressionSpecification;
+		"building-cutoff-fade-range"?: number | ExpressionSpecification;
 		"building-flood-light-color"?: PropertyValueSpecification<ColorSpecification>;
 		"building-flood-light-color-transition"?: TransitionSpecification;
 		"building-flood-light-color-use-theme"?: PropertyValueSpecification<string>;
@@ -1294,7 +1378,15 @@ type BuildingLayerSpecification = {
 	 */
 	"appearances"?: Array<AppearanceSpecification>;
 };
-type RasterLayerSpecification = {
+/**
+ * @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";
 	"metadata"?: unknown;
@@ -1310,7 +1402,7 @@ type RasterLayerSpecification = {
 	"paint"?: {
 		"raster-opacity"?: PropertyValueSpecification<number>;
 		"raster-opacity-transition"?: TransitionSpecification;
-		"raster-color"?: ExpressionSpecification;
+		"raster-color"?: ColorSpecification | ExpressionSpecification;
 		"raster-color-use-theme"?: PropertyValueSpecification<string>;
 		"raster-color-mix"?: PropertyValueSpecification<[
 			number,
@@ -1353,7 +1445,15 @@ type RasterLayerSpecification = {
 	 */
 	"appearances"?: Array<AppearanceSpecification>;
 };
-type RasterParticleLayerSpecification = {
+/**
+ * @deprecated Use `RasterLayerSpecification['layout']` instead.
+ */
+export type RasterLayout = RasterLayerSpecification["layout"];
+/**
+ * @deprecated Use `RasterLayerSpecification['paint']` instead.
+ */
+export type RasterPaint = RasterLayerSpecification["paint"];
+export type RasterParticleLayerSpecification = {
 	"id": string;
 	"type": "raster-particle";
 	"metadata"?: unknown;
@@ -1369,7 +1469,7 @@ type RasterParticleLayerSpecification = {
 	"paint"?: {
 		"raster-particle-array-band"?: string;
 		"raster-particle-count"?: number;
-		"raster-particle-color"?: ExpressionSpecification;
+		"raster-particle-color"?: ColorSpecification | ExpressionSpecification;
 		"raster-particle-color-use-theme"?: PropertyValueSpecification<string>;
 		"raster-particle-max-speed"?: number;
 		"raster-particle-speed-factor"?: PropertyValueSpecification<number>;
@@ -1385,7 +1485,15 @@ type RasterParticleLayerSpecification = {
 	 */
 	"appearances"?: Array<AppearanceSpecification>;
 };
-type HillshadeLayerSpecification = {
+/**
+ * @deprecated Use `RasterParticleLayerSpecification['layout']` instead.
+ */
+export type RasterParticleLayout = RasterParticleLayerSpecification["layout"];
+/**
+ * @deprecated Use `RasterParticleLayerSpecification['paint']` instead.
+ */
+export type RasterParticlePaint = RasterParticleLayerSpecification["paint"];
+export type HillshadeLayerSpecification = {
 	"id": string;
 	"type": "hillshade";
 	"metadata"?: unknown;
@@ -1420,7 +1528,15 @@ type HillshadeLayerSpecification = {
 	 */
 	"appearances"?: Array<AppearanceSpecification>;
 };
-type ModelLayerSpecification = {
+/**
+ * @deprecated Use `HillshadeLayerSpecification['layout']` instead.
+ */
+export type HillshadeLayout = HillshadeLayerSpecification["layout"];
+/**
+ * @deprecated Use `HillshadeLayerSpecification['paint']` instead.
+ */
+export type HillshadePaint = HillshadeLayerSpecification["paint"];
+export type ModelLayerSpecification = {
 	"id": string;
 	"type": "model";
 	"metadata"?: unknown;
@@ -1433,6 +1549,10 @@ type ModelLayerSpecification = {
 	"layout"?: {
 		"visibility"?: "visible" | "none" | ExpressionSpecification;
 		"model-id"?: DataDrivenPropertyValueSpecification<string>;
+		/**
+		 * @experimental This property is experimental and subject to change in future versions.
+		 */
+		"model-allow-density-reduction"?: boolean;
 	};
 	"paint"?: {
 		"model-opacity"?: DataDrivenPropertyValueSpecification<number>;
@@ -1477,7 +1597,7 @@ type ModelLayerSpecification = {
 			number
 		]>;
 		"model-height-based-emissive-strength-multiplier-transition"?: TransitionSpecification;
-		"model-cutoff-fade-range"?: ExpressionSpecification;
+		"model-cutoff-fade-range"?: number | ExpressionSpecification;
 		"model-front-cutoff"?: PropertyValueSpecification<[
 			number,
 			number,
@@ -1490,7 +1610,15 @@ type ModelLayerSpecification = {
 	 */
 	"appearances"?: Array<AppearanceSpecification>;
 };
-type BackgroundLayerSpecification = {
+/**
+ * @deprecated Use `ModelLayerSpecification['layout']` instead.
+ */
+export type ModelLayout = ModelLayerSpecification["layout"];
+/**
+ * @deprecated Use `ModelLayerSpecification['paint']` instead.
+ */
+export type ModelPaint = ModelLayerSpecification["paint"];
+export type BackgroundLayerSpecification = {
 	"id": string;
 	"type": "background";
 	"metadata"?: unknown;
@@ -1522,7 +1650,15 @@ type BackgroundLayerSpecification = {
 	 */
 	"appearances"?: Array<AppearanceSpecification>;
 };
-type SkyLayerSpecification = {
+/**
+ * @deprecated Use `BackgroundLayerSpecification['layout']` instead.
+ */
+export type BackgroundLayout = BackgroundLayerSpecification["layout"];
+/**
+ * @deprecated Use `BackgroundLayerSpecification['paint']` instead.
+ */
+export type BackgroundPaint = BackgroundLayerSpecification["paint"];
+export type SkyLayerSpecification = {
 	"id": string;
 	"type": "sky";
 	"metadata"?: unknown;
@@ -1547,7 +1683,7 @@ type SkyLayerSpecification = {
 			number
 		]>;
 		"sky-gradient-radius"?: PropertyValueSpecification<number>;
-		"sky-gradient"?: ExpressionSpecification;
+		"sky-gradient"?: ColorSpecification | ExpressionSpecification;
 		"sky-gradient-use-theme"?: PropertyValueSpecification<string>;
 		"sky-atmosphere-halo-color"?: ColorSpecification;
 		"sky-atmosphere-halo-color-use-theme"?: PropertyValueSpecification<string>;
@@ -1561,7 +1697,15 @@ type SkyLayerSpecification = {
 	 */
 	"appearances"?: Array<AppearanceSpecification>;
 };
-type SlotLayerSpecification = {
+/**
+ * @deprecated Use `SkyLayerSpecification['layout']` instead.
+ */
+export type SkyLayout = SkyLayerSpecification["layout"];
+/**
+ * @deprecated Use `SkyLayerSpecification['paint']` instead.
+ */
+export type SkyPaint = SkyLayerSpecification["paint"];
+export type SlotLayerSpecification = {
 	"id": string;
 	"type": "slot";
 	"metadata"?: unknown;
@@ -1578,7 +1722,7 @@ type SlotLayerSpecification = {
 	"layout"?: never;
 	"paint"?: never;
 };
-type ClipLayerSpecification = {
+export type ClipLayerSpecification = {
 	"id": string;
 	"type": "clip";
 	"metadata"?: unknown;
@@ -1589,8 +1733,8 @@ type ClipLayerSpecification = {
 	"maxzoom"?: number;
 	"filter"?: FilterSpecification;
 	"layout"?: {
-		"clip-layer-types"?: ExpressionSpecification;
-		"clip-layer-scope"?: ExpressionSpecification;
+		"clip-layer-types"?: Array<"model" | "symbol"> | ExpressionSpecification;
+		"clip-layer-scope"?: Array<string> | ExpressionSpecification;
 	};
 	/**
 	 * @experimental This property is experimental and subject to change in future versions.
@@ -1598,7 +1742,110 @@ type ClipLayerSpecification = {
 	"appearances"?: Array<AppearanceSpecification>;
 	"paint"?: never;
 };
-type LayerSpecification = FillLayerSpecification | LineLayerSpecification | SymbolLayerSpecification | CircleLayerSpecification | HeatmapLayerSpecification | FillExtrusionLayerSpecification | BuildingLayerSpecification | RasterLayerSpecification | RasterParticleLayerSpecification | HillshadeLayerSpecification | ModelLayerSpecification | BackgroundLayerSpecification | SkyLayerSpecification | SlotLayerSpecification | ClipLayerSpecification;
+/**
+ * @deprecated Use `ClipLayerSpecification['layout']` instead.
+ */
+export type ClipLayout = ClipLayerSpecification["layout"];
+export type LayerSpecification = FillLayerSpecification | LineLayerSpecification | SymbolLayerSpecification | CircleLayerSpecification | HeatmapLayerSpecification | FillExtrusionLayerSpecification | BuildingLayerSpecification | RasterLayerSpecification | RasterParticleLayerSpecification | HillshadeLayerSpecification | ModelLayerSpecification | BackgroundLayerSpecification | SkyLayerSpecification | SlotLayerSpecification | ClipLayerSpecification;
+export type LayoutSpecification = UnionToIntersection<NonNullable<LayerSpecification["layout"]>>;
+export type PaintSpecification = UnionToIntersection<NonNullable<LayerSpecification["paint"]>>;
+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 `BuildingLayerSpecification` instead.
+ */
+export type BuildingLayer = BuildingLayerSpecification;
+/**
+ * @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 Use `LayoutSpecification` instead.
+ */
+export type AnyLayout = LayoutSpecification;
+/**
+ * @deprecated Use `PaintSpecification` instead.
+ */
+export type AnyPaint = PaintSpecification;
+/**
+ * @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;
 /**
  * Migrate a Mapbox GL Style to the latest version.
  *
@@ -1908,11 +2155,11 @@ type CanonicalTileID = {
 	y: number;
 };
 type SerializedExpression = Array<unknown> | Array<string> | string | number | boolean | null;
-interface Expression {
+interface Expression$1 {
 	readonly type: Type;
 	value?: any;
 	evaluate: (ctx: EvaluationContext) => any;
-	eachChild: (fn: (arg1: Expression) => void) => void;
+	eachChild: (fn: (arg1: Expression$1) => void) => void;
 	/**
 	  * Statically analyze the expression, attempting to enumerate possible outputs. Returns
 	  * false if the complete set of outputs is statically undecidable, otherwise true.
@@ -1921,8 +2168,8 @@ interface Expression {
 	serialize: () => SerializedExpression;
 }
 type ConfigOptionValue = {
-	default: Expression;
-	value?: Expression;
+	default: Expression$1;
+	value?: Expression$1;
 	values?: Array<unknown>;
 	minValue?: number;
 	maxValue?: number;
@@ -2034,7 +2281,7 @@ interface GlobalProperties {
 	activeFloors?: Set<string>;
 }
 declare class StyleExpression {
-	expression: Expression;
+	expression: Expression$1;
 	_scope?: string;
 	_options?: ConfigOptions;
 	_iconImageUseTheme?: string;
@@ -2048,7 +2295,7 @@ declare class StyleExpression {
 	};
 	configDependencies: Set<string>;
 	isIndoorDependent: boolean;
-	constructor(expression: Expression, propertySpec?: StylePropertySpecification, scope?: string, options?: ConfigOptions, iconImageUseTheme?: string);
+	constructor(expression: Expression$1, propertySpec?: StylePropertySpecification, scope?: string, options?: ConfigOptions, iconImageUseTheme?: string);
 	evaluateWithoutErrorHandling(globals: GlobalProperties, feature?: Feature, featureState?: FeatureState, canonical?: CanonicalTileID, availableImages?: ImageId[], formattedSection?: FormattedSection, featureTileCoord?: Point, featureDistanceData?: FeatureDistanceData): any;
 	evaluate(globals: GlobalProperties, feature?: Feature, featureState?: FeatureState, canonical?: CanonicalTileID, availableImages?: ImageId[], formattedSection?: FormattedSection, featureTileCoord?: Point, featureDistanceData?: FeatureDistanceData, iconImageUseTheme?: string): any;
 }
@@ -2230,7 +2477,7 @@ type MapboxStyleSpecification = StyleSpecification & {
 export function validateMapboxApiSupported(style: MapboxStyleSpecification, styleSpec?: StyleReference): ValidationErrors;
 type ExpressionType = "data-driven" | "color-ramp" | "data-constant" | "constant";
 type ExpressionParameter = "zoom" | "pitch" | "feature" | "raster-value" | "feature-state" | "line-progress" | "measure-light" | "heatmap-density" | "sky-radial-progress" | "distance-from-center" | "raster-particle-speed";
-type ExpressionSpecification$1 = {
+export type PropertyExpressionSpecification = {
 	interpolated: boolean;
 	parameters?: ExpressionParameter[];
 	relaxZoomRestriction?: boolean;
@@ -2239,7 +2486,7 @@ export type ArrayPropertySpecification = {
 	type: "array";
 	"property-type": ExpressionType;
 	value: "enum";
-	expression?: ExpressionSpecification$1;
+	expression?: PropertyExpressionSpecification;
 	transition?: boolean;
 	default?: string[];
 	length?: number;
@@ -2257,7 +2504,7 @@ export type ArrayPropertySpecification = {
 	type: "array";
 	"property-type": ExpressionType;
 	value: "number";
-	expression?: ExpressionSpecification$1;
+	expression?: PropertyExpressionSpecification;
 	transition?: boolean;
 	default?: number[];
 	minimum?: number;
@@ -2275,7 +2522,7 @@ export type ArrayPropertySpecification = {
 	type: "array";
 	"property-type": ExpressionType;
 	value: "string";
-	expression?: ExpressionSpecification$1;
+	expression?: PropertyExpressionSpecification;
 	transition?: boolean;
 	default?: string[];
 	length?: number;
@@ -2291,7 +2538,7 @@ export type ArrayPropertySpecification = {
 export type BooleanPropertySpecification = {
 	type: "boolean";
 	"property-type": ExpressionType;
-	expression?: ExpressionSpecification$1;
+	expression?: PropertyExpressionSpecification;
 	transition?: boolean;
 	default?: boolean;
 	overridable?: boolean;
@@ -2304,7 +2551,7 @@ export type BooleanPropertySpecification = {
 export type ColorPropertySpecification = {
 	type: "color";
 	"property-type": ExpressionType;
-	expression?: ExpressionSpecification$1;
+	expression?: PropertyExpressionSpecification;
 	transition?: boolean;
 	default?: string;
 	"use-theme"?: boolean;
@@ -2318,7 +2565,7 @@ export type ColorPropertySpecification = {
 export type EnumPropertySpecification = {
 	type: "enum";
 	"property-type": ExpressionType;
-	expression?: ExpressionSpecification$1;
+	expression?: PropertyExpressionSpecification;
 	transition?: boolean;
 	default?: string;
 	values?: {
@@ -2333,7 +2580,7 @@ export type EnumPropertySpecification = {
 export type FormattedPropertySpecification = {
 	type: "formatted";
 	"property-type": ExpressionType;
-	expression?: ExpressionSpecification$1;
+	expression?: PropertyExpressionSpecification;
 	transition?: boolean;
 	default?: string;
 	tokens?: boolean;
@@ -2345,7 +2592,7 @@ export type FormattedPropertySpecification = {
 export type NumberPropertySpecification = {
 	type: "number";
 	"property-type": ExpressionType;
-	expression?: ExpressionSpecification$1;
+	expression?: PropertyExpressionSpecification;
 	transition?: boolean;
 	default?: number;
 	minimum?: number;
@@ -2361,7 +2608,7 @@ export type NumberPropertySpecification = {
 export type ResolvedImagePropertySpecification = {
 	type: "resolvedImage";
 	"property-type": ExpressionType;
-	expression?: ExpressionSpecification$1;
+	expression?: PropertyExpressionSpecification;
 	transition?: boolean;
 	default?: string;
 	tokens?: boolean;
@@ -2374,7 +2621,7 @@ export type ResolvedImagePropertySpecification = {
 export type StringPropertySpecification = {
 	type: "string";
 	"property-type": ExpressionType;
-	expression?: ExpressionSpecification$1;
+	expression?: PropertyExpressionSpecification;
 	transition?: boolean;
 	default?: string;
 	tokens?: boolean;
@@ -2410,7 +2657,6 @@ export declare const visit: {
 };
 
 export {
-	ExpressionSpecification$1 as ExpressionSpecification,
 	_default as latest,
 	_default$1 as migrate,
 	_default$2 as composite,