@mapbox/mapbox-gl-style-spec 14.14.0-beta.2 → 14.15.0-alpha.ffa987fef46

package/dist/index.d.ts

@@ -24,21 +24,6 @@ declare const _default: StyleReference;
  * fs.writeFileSync('./dest.min.json', format(style, 0));
  */
 export declare function format(style: any, space?: number): string;
-/**
- * Migrate a Mapbox GL Style to the latest version.
- *
- * @private
- * @alias migrate
- * @param {object} style a Mapbox GL Style
- * @returns {Object} a migrated style
- * @example
- * var fs = require('fs');
- * var migrate = require('mapbox-gl-style-spec').migrate;
- * var style = fs.readFileSync('./style.json', 'utf8');
- * fs.writeFileSync('./style.json', JSON.stringify(migrate(style)));
- */
-declare function _default$1(style: any): any;
-declare function _default$2(style: any): any;
 type ColorSpecification = string;
 type FormattedSpecification = string;
 type ResolvedImageSpecification = string;
@@ -479,6 +464,11 @@ type SelectorPropertySpecification = {
 	 */
 	[_: string]: unknown;
 };
+type AppearanceSpecification = {
+	"condition"?: ExpressionSpecification;
+	"name"?: string;
+	"properties"?: unknown;
+};
 type VectorSourceSpecification = {
 	"type": "vector";
 	"url"?: string;
@@ -778,6 +768,7 @@ type FillLayerSpecification = {
 		"fill-tunnel-structure-color-transition"?: TransitionSpecification;
 		"fill-tunnel-structure-color-use-theme"?: PropertyValueSpecification<string>;
 	};
+	"appearances"?: Array<AppearanceSpecification>;
 };
 type LineLayerSpecification = {
 	"id": string;
@@ -865,6 +856,7 @@ type LineLayerSpecification = {
 		"line-occlusion-opacity"?: PropertyValueSpecification<number>;
 		"line-occlusion-opacity-transition"?: TransitionSpecification;
 	};
+	"appearances"?: Array<AppearanceSpecification>;
 };
 type SymbolLayerSpecification = {
 	"id": string;
@@ -904,6 +896,7 @@ type SymbolLayerSpecification = {
 			number
 		]>;
 		"icon-image"?: DataDrivenPropertyValueSpecification<ResolvedImageSpecification>;
+		"icon-image-use-theme"?: PropertyValueSpecification<string>;
 		"icon-rotate"?: DataDrivenPropertyValueSpecification<number>;
 		"icon-padding"?: PropertyValueSpecification<number>;
 		"icon-keep-upright"?: PropertyValueSpecification<boolean>;
@@ -1000,6 +993,7 @@ type SymbolLayerSpecification = {
 		"symbol-z-offset"?: DataDrivenPropertyValueSpecification<number>;
 		"symbol-z-offset-transition"?: TransitionSpecification;
 	};
+	"appearances"?: Array<AppearanceSpecification>;
 };
 type CircleLayerSpecification = {
 	"id": string;
@@ -1047,6 +1041,7 @@ type CircleLayerSpecification = {
 		"circle-emissive-strength"?: PropertyValueSpecification<number>;
 		"circle-emissive-strength-transition"?: TransitionSpecification;
 	};
+	"appearances"?: Array<AppearanceSpecification>;
 };
 type HeatmapLayerSpecification = {
 	"id": string;
@@ -1072,6 +1067,7 @@ type HeatmapLayerSpecification = {
 		"heatmap-opacity"?: PropertyValueSpecification<number>;
 		"heatmap-opacity-transition"?: TransitionSpecification;
 	};
+	"appearances"?: Array<AppearanceSpecification>;
 };
 type FillExtrusionLayerSpecification = {
 	"id": string;
@@ -1181,6 +1177,7 @@ type FillExtrusionLayerSpecification = {
 		"fill-extrusion-line-width-transition"?: TransitionSpecification;
 		"fill-extrusion-cast-shadows"?: boolean;
 	};
+	"appearances"?: Array<AppearanceSpecification>;
 };
 type BuildingLayerSpecification = {
 	"id": string;
@@ -1274,6 +1271,7 @@ type BuildingLayerSpecification = {
 		"building-facade-emissive-chance"?: PropertyValueSpecification<number>;
 		"building-cutoff-fade-range"?: ExpressionSpecification;
 	};
+	"appearances"?: Array<AppearanceSpecification>;
 };
 type RasterLayerSpecification = {
 	"id": string;
@@ -1329,6 +1327,7 @@ type RasterLayerSpecification = {
 		"raster-elevation"?: PropertyValueSpecification<number>;
 		"raster-elevation-transition"?: TransitionSpecification;
 	};
+	"appearances"?: Array<AppearanceSpecification>;
 };
 type RasterParticleLayerSpecification = {
 	"id": string;
@@ -1357,6 +1356,7 @@ type RasterParticleLayerSpecification = {
 		"raster-particle-elevation"?: PropertyValueSpecification<number>;
 		"raster-particle-elevation-transition"?: TransitionSpecification;
 	};
+	"appearances"?: Array<AppearanceSpecification>;
 };
 type HillshadeLayerSpecification = {
 	"id": string;
@@ -1388,6 +1388,7 @@ type HillshadeLayerSpecification = {
 		"hillshade-emissive-strength"?: PropertyValueSpecification<number>;
 		"hillshade-emissive-strength-transition"?: TransitionSpecification;
 	};
+	"appearances"?: Array<AppearanceSpecification>;
 };
 type ModelLayerSpecification = {
 	"id": string;
@@ -1453,6 +1454,7 @@ type ModelLayerSpecification = {
 			number
 		]>;
 	};
+	"appearances"?: Array<AppearanceSpecification>;
 };
 type BackgroundLayerSpecification = {
 	"id": string;
@@ -1481,6 +1483,7 @@ type BackgroundLayerSpecification = {
 		"background-emissive-strength"?: PropertyValueSpecification<number>;
 		"background-emissive-strength-transition"?: TransitionSpecification;
 	};
+	"appearances"?: Array<AppearanceSpecification>;
 };
 type SkyLayerSpecification = {
 	"id": string;
@@ -1516,6 +1519,7 @@ type SkyLayerSpecification = {
 		"sky-opacity"?: PropertyValueSpecification<number>;
 		"sky-opacity-transition"?: TransitionSpecification;
 	};
+	"appearances"?: Array<AppearanceSpecification>;
 };
 type SlotLayerSpecification = {
 	"id": string;
@@ -1527,6 +1531,7 @@ type SlotLayerSpecification = {
 	"minzoom"?: never;
 	"maxzoom"?: never;
 	"filter"?: never;
+	"appearances"?: Array<AppearanceSpecification>;
 	"layout"?: never;
 	"paint"?: never;
 };
@@ -1544,9 +1549,27 @@ type ClipLayerSpecification = {
 		"clip-layer-types"?: ExpressionSpecification;
 		"clip-layer-scope"?: ExpressionSpecification;
 	};
+	"appearances"?: Array<AppearanceSpecification>;
 	"paint"?: never;
 };
 type LayerSpecification = FillLayerSpecification | LineLayerSpecification | SymbolLayerSpecification | CircleLayerSpecification | HeatmapLayerSpecification | FillExtrusionLayerSpecification | BuildingLayerSpecification | RasterLayerSpecification | RasterParticleLayerSpecification | HillshadeLayerSpecification | ModelLayerSpecification | BackgroundLayerSpecification | SkyLayerSpecification | SlotLayerSpecification | ClipLayerSpecification;
+/**
+ * Migrate a Mapbox GL Style to the latest version.
+ *
+ * @private
+ * @alias migrate
+ * @param {object} style a Mapbox GL Style
+ * @returns {Object} a migrated style
+ * @example
+ * var fs = require('fs');
+ * var migrate = require('mapbox-gl-style-spec').migrate;
+ * var style = fs.readFileSync('./style.json', 'utf8');
+ * fs.writeFileSync('./style.json', JSON.stringify(migrate(style)));
+ */
+declare function _default$1(style: {
+	version: 7;
+} | StyleSpecification): StyleSpecification;
+declare function _default$2(style: StyleSpecification): StyleSpecification;
 /**
  * Given an array of layers, some of which may contain `ref` properties
  * whose value is the `id` of another property, return a new array where
@@ -1901,10 +1924,11 @@ declare class EvaluationContext {
 	featureDistanceData: FeatureDistanceData | null | undefined;
 	scope: string | null | undefined;
 	options: ConfigOptions | null | undefined;
+	iconImageUseTheme: string | null | undefined;
 	_parseColorCache: {
 		[_: string]: Color | null | undefined;
 	};
-	constructor(scope?: string | null, options?: ConfigOptions | null);
+	constructor(scope?: string | null, options?: ConfigOptions | null, iconImageUseTheme?: string);
 	id(): string | number | null;
 	geometryType(): null | string;
 	geometry(): Array<Array<Point>> | null | undefined;
@@ -1972,12 +1996,12 @@ declare class StyleExpression {
 		[_: string]: unknown;
 	};
 	configDependencies: Set<string>;
-	constructor(expression: Expression, propertySpec?: StylePropertySpecification, scope?: string, options?: ConfigOptions);
+	constructor(expression: Expression, 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): any;
+	evaluate(globals: GlobalProperties, feature?: Feature, featureState?: FeatureState, canonical?: CanonicalTileID, availableImages?: ImageId[], formattedSection?: FormattedSection, featureTileCoord?: Point, featureDistanceData?: FeatureDistanceData, iconImageUseTheme?: string): any;
 }
 declare function isExpression(expression: unknown): boolean;
-declare function createExpression(expression: unknown, propertySpec?: StylePropertySpecification | null, scope?: string | null, options?: ConfigOptions | null): Result<StyleExpression, Array<ParsingError$1>>;
+declare function createExpression(expression: unknown, propertySpec?: StylePropertySpecification | null, scope?: string | null, options?: ConfigOptions | null, iconImageUseTheme?: string | null): Result<StyleExpression, Array<ParsingError$1>>;
 declare class ZoomConstantExpression<Kind extends EvaluationKind> {
 	kind: Kind;
 	isStateDependent: boolean;
@@ -1987,7 +2011,7 @@ declare class ZoomConstantExpression<Kind extends EvaluationKind> {
 	isLineProgressConstant: boolean | null | undefined;
 	constructor(kind: Kind, expression: StyleExpression, isLightConstant?: boolean | null, isLineProgressConstant?: boolean | null);
 	evaluateWithoutErrorHandling(globals: GlobalProperties, feature?: Feature, featureState?: FeatureState, canonical?: CanonicalTileID, availableImages?: ImageId[], formattedSection?: FormattedSection): any;
-	evaluate(globals: GlobalProperties, feature?: Feature, featureState?: FeatureState, canonical?: CanonicalTileID, availableImages?: ImageId[], formattedSection?: FormattedSection): any;
+	evaluate(globals: GlobalProperties, feature?: Feature, featureState?: FeatureState, canonical?: CanonicalTileID, availableImages?: ImageId[], formattedSection?: FormattedSection, iconImageUseTheme?: string): any;
 }
 declare class ZoomDependentExpression<Kind extends EvaluationKind> {
 	kind: Kind;
@@ -2006,7 +2030,7 @@ declare class ZoomDependentExpression<Kind extends EvaluationKind> {
 type ConstantExpression = {
 	kind: "constant";
 	configDependencies: Set<string>;
-	readonly evaluate: (globals: GlobalProperties, feature?: Feature, featureState?: FeatureState, canonical?: CanonicalTileID, availableImages?: ImageId[]) => any;
+	readonly evaluate: (globals: GlobalProperties, feature?: Feature, featureState?: FeatureState, canonical?: CanonicalTileID, availableImages?: ImageId[], formattedSection?: FormattedSection, iconImageUseTheme?: string) => any;
 };
 type SourceExpression = {
 	kind: "source";
@@ -2031,13 +2055,13 @@ interface CompositeExpression {
 	isLightConstant: boolean | null | undefined;
 	isLineProgressConstant: boolean | null | undefined;
 	configDependencies: Set<string>;
-	readonly evaluate: (globals: GlobalProperties, feature?: Feature, featureState?: FeatureState, canonical?: CanonicalTileID, availableImages?: ImageId[], formattedSection?: FormattedSection) => any;
+	readonly evaluate: (globals: GlobalProperties, feature?: Feature, featureState?: FeatureState, canonical?: CanonicalTileID, availableImages?: ImageId[], formattedSection?: FormattedSection, iconImageUseTheme?: string) => any;
 	readonly interpolationFactor: (input: number, lower: number, upper: number) => number;
 	zoomStops: Array<number>;
 	interpolationType: InterpolationType | null | undefined;
 }
 type StylePropertyExpression = ConstantExpression | SourceExpression | CameraExpression | CompositeExpression;
-declare function createPropertyExpression(expression: any, propertySpec: StylePropertySpecification, scope?: string | null, options?: ConfigOptions | null): Result<StylePropertyExpression, Array<ParsingError$1>>;
+declare function createPropertyExpression(expression: any, propertySpec: StylePropertySpecification, scope?: string | null, options?: ConfigOptions | null, iconImageUseTheme?: string | null): Result<StylePropertyExpression, Array<ParsingError$1>>;
 declare class StylePropertyFunction<T> {
 	_parameters: PropertyValueSpecification<T>;
 	_specification: StylePropertySpecification;
@@ -2055,7 +2079,7 @@ declare class StylePropertyFunction<T> {
 		_specification: StylePropertySpecification;
 	};
 }
-declare function normalizePropertyExpression<T>(value: PropertyValueSpecification<T>, specification: StylePropertySpecification, scope?: string | null, options?: ConfigOptions | null): StylePropertyExpression;
+declare function normalizePropertyExpression<T>(value: PropertyValueSpecification<T>, specification: StylePropertySpecification, scope?: string | null, options?: ConfigOptions | null, iconImageUseTheme?: string | null): StylePropertyExpression;
 /**
  * Convert the given legacy filter to (the JSON representation of) an
  * equivalent expression

package/dist/index.es.js

@@ -1507,6 +1507,29 @@ var layer = {
 	paint: {
 		type: "paint",
 		doc: "Default paint properties for this layer."
+	},
+	appearances: {
+		type: "array",
+		value: "appearance",
+		"supported-layer-types": [
+			"symbol"
+		],
+		"private": true,
+		doc: "Conditional styling applied to layer features based on dynamic conditions. If multiple conditions are true, only the first matching appearance will be applied. Only properties marked with 'Can be used in appearances' are supported."
+	}
+};
+var appearance = {
+	condition: {
+		type: "expression",
+		doc: "A boolean expression that determines when this appearance should be applied."
+	},
+	name: {
+		type: "string",
+		doc: "Optional name for this appearance. Non-empty names should be unique within a layer."
+	},
+	properties: {
+		type: "*",
+		doc: "Style properties to apply when the condition is met."
 	}
 };
 var layout = [
@@ -2698,6 +2721,7 @@ var layout_symbol = {
 		minimum: 0,
 		units: "factor of the original icon size",
 		doc: "Scales the original size of the icon by the provided factor. The new pixel size of the image will be the original pixel size multiplied by `icon-size`. 1 is the original size; 3 triples the size of the image.",
+		appearance: true,
 		requires: [
 			"icon-image"
 		],
@@ -2841,6 +2865,8 @@ var layout_symbol = {
 		type: "resolvedImage",
 		doc: "Name of image in sprite to use for drawing an image background.",
 		tokens: true,
+		appearance: true,
+		"use-theme": true,
 		"sdk-support": {
 			"basic functionality": {
 				js: "0.10.0",
@@ -2868,6 +2894,7 @@ var layout_symbol = {
 		period: 360,
 		units: "degrees",
 		doc: "Rotates the icon clockwise.",
+		appearance: true,
 		requires: [
 			"icon-image"
 		],
@@ -2956,6 +2983,7 @@ var layout_symbol = {
 			0
 		],
 		doc: "Offset distance of icon from its anchor. Positive values indicate right and down, while negative values indicate left and up. Each component is multiplied by the value of `icon-size` to obtain the final offset in pixels. When combined with `icon-rotate` the offset will be as if the rotated direction was up.",
+		appearance: true,
 		requires: [
 			"icon-image"
 		],
@@ -10182,6 +10210,7 @@ var v8 = {
 	source_image: source_image,
 	source_model: source_model,
 	layer: layer,
+	appearance: appearance,
 	layout: layout,
 	layout_background: layout_background,
 	layout_sky: layout_sky,
@@ -14010,7 +14039,7 @@ const geometryTypes = [
     'Polygon'
 ];
 class EvaluationContext {
-    constructor(scope, options) {
+    constructor(scope, options, iconImageUseTheme) {
         this.globals = null;
         this.feature = null;
         this.featureState = null;
@@ -14022,6 +14051,7 @@ class EvaluationContext {
         this.featureDistanceData = null;
         this.scope = scope;
         this.options = options;
+        this.iconImageUseTheme = iconImageUseTheme;
     }
     id() {
         return this.feature && this.feature.id !== void 0 ? this.feature.id : null;
@@ -14110,7 +14140,7 @@ class CompoundExpression {
                 continue;
             overloadParams.push(params);
             overloadIndex++;
-            signatureContext = new ParsingContext(context.registry, context.path, null, context.scope, void 0, context._scope, context.options);
+            signatureContext = new ParsingContext(context.registry, context.path, null, context.scope, void 0, context._scope, context.options, context.iconImageUseTheme);
             const parsedArgs = [];
             let argParseFailed = false;
             for (let i = 1; i < args.length; i++) {
@@ -16246,7 +16276,7 @@ class Var {
 }
 
 class ParsingContext {
-    constructor(registry, path = [], expectedType, scope = new Scope(), errors = [], _scope, options) {
+    constructor(registry, path = [], expectedType, scope = new Scope(), errors = [], _scope, options, iconImageUseTheme) {
         this.registry = registry;
         this.path = path;
         this.key = path.map(part => {
@@ -16260,6 +16290,7 @@ class ParsingContext {
         this.expectedType = expectedType;
         this._scope = _scope;
         this.options = options;
+        this.iconImageUseTheme = iconImageUseTheme;
     }
     /**
    * @param expr the JSON expression to parse
@@ -16322,7 +16353,7 @@ class ParsingContext {
                     }
                 }
                 if (!(parsed instanceof Literal) && parsed.type.kind !== 'resolvedImage' && isConstant(parsed)) {
-                    const ec = new EvaluationContext(this._scope, this.options);
+                    const ec = new EvaluationContext(this._scope, this.options, this.iconImageUseTheme);
                     try {
                         parsed = new Literal(parsed.type, parsed.evaluate(ec));
                     } catch (e) {
@@ -16356,7 +16387,7 @@ class ParsingContext {
         let path = typeof index === 'number' ? this.path.concat(index) : this.path;
         path = typeof key === 'string' ? path.concat(key) : path;
         const scope = bindings ? this.scope.concat(bindings) : this.scope;
-        return new ParsingContext(this.registry, path, expectedType || null, scope, this.errors, this._scope, this.options);
+        return new ParsingContext(this.registry, path, expectedType || null, scope, this.errors, this._scope, this.options, this.iconImageUseTheme);
     }
     /**
    * Push a parsing (or type checking) error into the `this.errors`
@@ -18000,7 +18031,6 @@ CompoundExpression.register(expressions, {
         overloads: [
             [
                 [StringType],
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-return
                 (ctx, [key]) => get(key.evaluate(ctx), ctx.properties())
             ],
             [
@@ -18016,7 +18046,6 @@ CompoundExpression.register(expressions, {
     'feature-state': [
         ValueType,
         [StringType],
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         (ctx, [key]) => get(key.evaluate(ctx), ctx.featureState || {})
     ],
     'properties': [
@@ -18742,10 +18771,10 @@ function interpolationFactor(input, base, lowerValue, upperValue) {
 }
 
 class StyleExpression {
-    constructor(expression, propertySpec, scope, options) {
+    constructor(expression, propertySpec, scope, options, iconImageUseTheme) {
         this.expression = expression;
         this._warningHistory = {};
-        this._evaluator = new EvaluationContext(scope, options);
+        this._evaluator = new EvaluationContext(scope, options, iconImageUseTheme);
         this._defaultValue = propertySpec ? getDefaultValue(propertySpec) : null;
         this._enumValues = propertySpec && propertySpec.type === 'enum' ? propertySpec.values : null;
         this.configDependencies = getConfigDependencies(expression);
@@ -18761,7 +18790,7 @@ class StyleExpression {
         this._evaluator.featureDistanceData = featureDistanceData || null;
         return this.expression.evaluate(this._evaluator);
     }
-    evaluate(globals, feature, featureState, canonical, availableImages, formattedSection, featureTileCoord, featureDistanceData) {
+    evaluate(globals, feature, featureState, canonical, availableImages, formattedSection, featureTileCoord, featureDistanceData, iconImageUseTheme) {
         this._evaluator.globals = globals;
         this._evaluator.feature = feature || null;
         this._evaluator.featureState = featureState || null;
@@ -18770,6 +18799,7 @@ class StyleExpression {
         this._evaluator.formattedSection = formattedSection || null;
         this._evaluator.featureTileCoord = featureTileCoord || null;
         this._evaluator.featureDistanceData = featureDistanceData || null;
+        this._evaluator.iconImageUseTheme = iconImageUseTheme || null;
         try {
             const val = this.expression.evaluate(this._evaluator);
             if (val === null || val === void 0 || typeof val === 'number' && val !== val) {
@@ -18793,13 +18823,13 @@ class StyleExpression {
 function isExpression(expression) {
     return Array.isArray(expression) && expression.length > 0 && typeof expression[0] === 'string' && expression[0] in expressions;
 }
-function createExpression(expression, propertySpec, scope, options) {
-    const parser = new ParsingContext(expressions, [], propertySpec ? getExpectedType(propertySpec) : void 0, void 0, void 0, scope, options);
+function createExpression(expression, propertySpec, scope, options, iconImageUseTheme) {
+    const parser = new ParsingContext(expressions, [], propertySpec ? getExpectedType(propertySpec) : void 0, void 0, void 0, scope, options, iconImageUseTheme);
     const parsed = parser.parse(expression, void 0, void 0, void 0, propertySpec && propertySpec.type === 'string' ? { typeAnnotation: 'coerce' } : void 0);
     if (!parsed) {
         return error(parser.errors);
     }
-    return success(new StyleExpression(parsed, propertySpec, scope, options));
+    return success(new StyleExpression(parsed, propertySpec, scope, options, iconImageUseTheme));
 }
 class ZoomConstantExpression {
     constructor(kind, expression, isLightConstant, isLineProgressConstant) {
@@ -18813,8 +18843,8 @@ class ZoomConstantExpression {
     evaluateWithoutErrorHandling(globals, feature, featureState, canonical, availableImages, formattedSection) {
         return this._styleExpression.evaluateWithoutErrorHandling(globals, feature, featureState, canonical, availableImages, formattedSection);
     }
-    evaluate(globals, feature, featureState, canonical, availableImages, formattedSection) {
-        return this._styleExpression.evaluate(globals, feature, featureState, canonical, availableImages, formattedSection);
+    evaluate(globals, feature, featureState, canonical, availableImages, formattedSection, iconImageUseTheme) {
+        return this._styleExpression.evaluate(globals, feature, featureState, canonical, availableImages, formattedSection, void 0, void 0, iconImageUseTheme);
     }
 }
 class ZoomDependentExpression {
@@ -18842,8 +18872,8 @@ class ZoomDependentExpression {
         }
     }
 }
-function createPropertyExpression(expression, propertySpec, scope, options) {
-    expression = createExpression(expression, propertySpec, scope, options);
+function createPropertyExpression(expression, propertySpec, scope, options, iconImageUseTheme) {
+    expression = createExpression(expression, propertySpec, scope, options, iconImageUseTheme);
     if (expression.result === 'error') {
         return expression;
     }
@@ -18899,11 +18929,11 @@ class StylePropertyFunction {
         };
     }
 }
-function normalizePropertyExpression(value, specification, scope, options) {
+function normalizePropertyExpression(value, specification, scope, options, iconImageUseTheme) {
     if (isFunction(value)) {
         return new StylePropertyFunction(value, specification);
     } else if (isExpression(value) || Array.isArray(value) && value.length > 0) {
-        const expression = createPropertyExpression(value, specification, scope, options);
+        const expression = createPropertyExpression(value, specification, scope, options, iconImageUseTheme);
         if (expression.result === 'error') {
             throw new Error(expression.value.map(err => `${ err.key }: ${ err.message }`).join(', '));
         }
@@ -19802,11 +19832,11 @@ function migrate (style) {
         migrated = true;
     }
     if (style.version === 8) {
-        migrated = migrateToExpressions(style);
+        style = migrateToExpressions(style);
         migrated = true;
     }
     if (!migrated) {
-        throw new Error('cannot migrate from', style.version);
+        throw new Error(`Cannot migrate from ${ style.version }`);
     }
     return style;
 }
@@ -21090,7 +21120,7 @@ function validateProperty(options, propertyType) {
     if (!layerSpec)
         return [];
     const useThemeMatch = propertyKey.match(/^(.*)-use-theme$/);
-    if (propertyType === 'paint' && useThemeMatch && layerSpec[useThemeMatch[1]]) {
+    if (useThemeMatch && layerSpec[useThemeMatch[1]]) {
         if (isExpression(value)) {
             const errors2 = [];
             return errors2.concat(validate({
@@ -21109,7 +21139,6 @@ function validateProperty(options, propertyType) {
                 },
                 style,
                 styleSpec,
-                // @ts-expect-error - TS2353 - Object literal may only specify known properties, and 'expressionContext' does not exist in type 'ValidationOptions'.
                 expressionContext: 'property',
                 propertyType,
                 propertyKey
@@ -21168,7 +21197,6 @@ Use an identity property function instead: ${ example }.`)];
         valueSpec,
         style,
         styleSpec,
-        // @ts-expect-error - TS2353 - Object literal may only specify known properties, and 'expressionContext' does not exist in type 'ValidationOptions'.
         expressionContext: 'property',
         propertyType,
         propertyKey
@@ -21821,9 +21849,7 @@ function validateIconset(options) {
 }
 
 const VALIDATORS = {
-    '*'() {
-        return [];
-    },
+    '*': () => [],
     'array': validateArray,
     'boolean': validateBoolean,
     'number': validateNumber,