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

package/dist/index.d.ts

@@ -896,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>;
@@ -1923,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;
@@ -1994,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;
@@ -2009,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;
@@ -2028,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";
@@ -2053,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;
@@ -2077,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

@@ -2866,6 +2866,7 @@ var layout_symbol = {
 		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",
@@ -14038,7 +14039,7 @@ const geometryTypes = [
     'Polygon'
 ];
 class EvaluationContext {
-    constructor(scope, options) {
+    constructor(scope, options, iconImageUseTheme) {
         this.globals = null;
         this.feature = null;
         this.featureState = null;
@@ -14050,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;
@@ -14138,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++) {
@@ -16274,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 => {
@@ -16288,6 +16290,7 @@ class ParsingContext {
         this.expectedType = expectedType;
         this._scope = _scope;
         this.options = options;
+        this.iconImageUseTheme = iconImageUseTheme;
     }
     /**
    * @param expr the JSON expression to parse
@@ -16350,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) {
@@ -16384,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`
@@ -18768,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);
@@ -18787,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;
@@ -18796,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) {
@@ -18819,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) {
@@ -18839,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 {
@@ -18868,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;
     }
@@ -18925,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(', '));
         }
@@ -21116,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({