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

package/expression/compound_expression.ts

@@ -85,7 +85,7 @@ class CompoundExpression implements Expression {
 
             // Use a fresh context for each attempted signature so that, if
             // we eventually succeed, we haven't polluted `context.errors`.
-            signatureContext = new ParsingContext(context.registry, context.path, null, context.scope, undefined, context._scope, context.options);
+            signatureContext = new ParsingContext(context.registry, context.path, null, context.scope, undefined, context._scope, context.options, context.iconImageUseTheme);
 
             // First parse all the args, potentially coercing to the
             // types expected by this overload.

package/expression/definitions/config.ts

@@ -12,7 +12,7 @@ import type EvaluationContext from '../evaluation_context';
 
 const FQIDSeparator = '\u001F';
 
-function makeConfigFQID(id: string, ownScope?: string | null, contextScope?: string | null): string {
+export function makeConfigFQID(id: string, ownScope?: string | null, contextScope?: string | null): string {
     return [id, ownScope, contextScope].filter(Boolean).join(FQIDSeparator);
 }
 

package/expression/definitions/image.ts

@@ -2,9 +2,9 @@ import ResolvedImage from '../types/resolved_image';
 import {ImageId} from '../types/image_id';
 import {ColorType, ResolvedImageType, StringType} from '../types';
 
+import type EvaluationContext from '../evaluation_context';
 import type Color from '../../util/color';
 import type ParsingContext from '../parsing_context';
-import type EvaluationContext from '../evaluation_context';
 import type {Type} from '../types';
 import type {Expression, SerializedExpression} from '../expression';
 

package/expression/evaluation_context.ts

@@ -21,12 +21,13 @@ 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) {
         this.globals = null;
         this.feature = null;
         this.featureState = null;
@@ -38,6 +39,7 @@ class EvaluationContext {
         this.featureDistanceData = null;
         this.scope = scope;
         this.options = options;
+        this.iconImageUseTheme = iconImageUseTheme;
     }
 
     id(): string | number | null {

package/expression/index.ts

@@ -72,10 +72,10 @@ export class StyleExpression {
     _enumValues?: {[_: 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) {
         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 = isConstant.getConfigDependencies(expression);
@@ -113,6 +113,7 @@ export class StyleExpression {
         formattedSection?: FormattedSection,
         featureTileCoord?: Point,
         featureDistanceData?: FeatureDistanceData,
+        iconImageUseTheme?: string
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     ): any {
         this._evaluator.globals = globals;
@@ -123,6 +124,7 @@ export 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);
@@ -165,8 +167,9 @@ export function createExpression(
     propertySpec?: StylePropertySpecification | null,
     scope?: string | null,
     options?: ConfigOptions | null,
+    iconImageUseTheme?: string | null
 ): Result<StyleExpression, Array<ParsingError>> {
-    const parser = new ParsingContext(definitions, [], propertySpec ? getExpectedType(propertySpec) : undefined, undefined, undefined, scope, options);
+    const parser = new ParsingContext(definitions, [], propertySpec ? getExpectedType(propertySpec) : undefined, undefined, undefined, scope, options, iconImageUseTheme);
 
     // For string-valued properties, coerce to string at the top level rather than asserting.
     const parsed = parser.parse(expression, undefined, undefined, undefined,
@@ -177,7 +180,7 @@ export function createExpression(
         return error(parser.errors);
     }
 
-    return success(new StyleExpression(parsed, propertySpec, scope, options));
+    return success(new StyleExpression(parsed, propertySpec, scope, options, iconImageUseTheme));
 }
 
 export class ZoomConstantExpression<Kind extends EvaluationKind> {
@@ -216,9 +219,10 @@ export class ZoomConstantExpression<Kind extends EvaluationKind> {
         canonical?: CanonicalTileID,
         availableImages?: ImageId[],
         formattedSection?: FormattedSection,
+        iconImageUseTheme?: string
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     ): any {
-        return this._styleExpression.evaluate(globals, feature, featureState, canonical, availableImages, formattedSection);
+        return this._styleExpression.evaluate(globals, feature, featureState, canonical, availableImages, formattedSection, undefined, undefined, iconImageUseTheme);
     }
 }
 
@@ -286,6 +290,8 @@ export type ConstantExpression = {
         featureState?: FeatureState,
         canonical?: CanonicalTileID,
         availableImages?: ImageId[],
+        formattedSection?: FormattedSection,
+        iconImageUseTheme?: string
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     ) => any;
 };
@@ -337,6 +343,7 @@ export interface CompositeExpression {
         canonical?: CanonicalTileID,
         availableImages?: ImageId[],
         formattedSection?: FormattedSection,
+        iconImageUseTheme?: string
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     ) => any;
     readonly interpolationFactor: (input: number, lower: number, upper: number) => number;
@@ -352,8 +359,9 @@ export function createPropertyExpression(
     propertySpec: StylePropertySpecification,
     scope?: string | null,
     options?: ConfigOptions | null,
+    iconImageUseTheme?: string | null
 ): Result<StylePropertyExpression, Array<ParsingError>> {
-    expression = createExpression(expression, propertySpec, scope, options);
+    expression = createExpression(expression, propertySpec, scope, options, iconImageUseTheme);
     if (expression.result === 'error') {
         return expression as Result<StylePropertyExpression, Array<ParsingError>>;
     }
@@ -446,12 +454,13 @@ export function normalizePropertyExpression<T>(
     specification: StylePropertySpecification,
     scope?: string | null,
     options?: ConfigOptions | null,
+    iconImageUseTheme?: string | null
 ): StylePropertyExpression {
     if (isFunction(value)) {
         return new StylePropertyFunction(value, specification) as unknown as StylePropertyExpression;
 
     } 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') {
             // this should have been caught in validation
             throw new Error(expression.value.map(err => `${err.key}: ${err.message}`).join(', '));

package/expression/parsing_context.ts

@@ -29,6 +29,7 @@ class ParsingContext {
     errors: Array<ParsingError>;
     _scope: string | null | undefined;
     options: ConfigOptions | null | undefined;
+    iconImageUseTheme: string;
 
     // The expected type of this expression. Provided only to allow Expression
     // implementations to infer argument types: Expression#parse() need not
@@ -43,7 +44,8 @@ class ParsingContext {
         scope: Scope = new Scope(),
         errors: Array<ParsingError> = [],
         _scope?: string | null,
-        options?: ConfigOptions | null
+        options?: ConfigOptions | null,
+        iconImageUseTheme?: string
     ) {
         this.registry = registry;
         this.path = path;
@@ -53,6 +55,7 @@ class ParsingContext {
         this.expectedType = expectedType;
         this._scope = _scope;
         this.options = options;
+        this.iconImageUseTheme = iconImageUseTheme;
     }
 
     /**
@@ -154,7 +157,7 @@ class ParsingContext {
                 // parsed/compiled result. Expressions that expect an image should
                 // not be resolved here so we can later get the available images.
                 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) {
@@ -201,7 +204,8 @@ class ParsingContext {
             scope,
             this.errors,
             this._scope,
-            this.options
+            this.options,
+            this.iconImageUseTheme
         );
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mapbox/mapbox-gl-style-spec",
-  "version": "14.14.0",
+  "version": "14.15.0-alpha.ffa987fef46",
   "description": "a specification for mapbox gl styles",
   "author": "Mapbox",
   "license": "SEE LICENSE IN LICENSE.txt",

package/reference/v8.json

@@ -2955,6 +2955,7 @@
       "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",

package/types.ts

@@ -770,6 +770,7 @@ export type SymbolLayerSpecification = {
         "icon-text-fit"?: DataDrivenPropertyValueSpecification<"none" | "width" | "height" | "both">,
         "icon-text-fit-padding"?: DataDrivenPropertyValueSpecification<[number, number, number, number]>,
         "icon-image"?: DataDrivenPropertyValueSpecification<ResolvedImageSpecification>,
+        "icon-image-use-theme"?: PropertyValueSpecification<string>,
         "icon-rotate"?: DataDrivenPropertyValueSpecification<number>,
         "icon-padding"?: PropertyValueSpecification<number>,
         "icon-keep-upright"?: PropertyValueSpecification<boolean>,

package/validate/validate_property.ts

@@ -28,7 +28,7 @@ export default function validateProperty(options: PropertyValidationOptions, pro
     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 errors: ValidationError[] = [];
             return errors.concat(validate({