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

package/composite.ts

@@ -1,10 +1,9 @@
-/* eslint-disable @typescript-eslint/ban-ts-comment */
-// @ts-nocheck
+import type {StyleSpecification} from './types';
 
-export default function (style) {
-    const styleIDs = [];
-    const sourceIDs = [];
-    const compositedSourceLayers = [];
+export default function (style: StyleSpecification): StyleSpecification {
+    const styleIDs: string[] = [];
+    const sourceIDs: string[] = [];
+    const compositedSourceLayers: string[] = [];
 
     for (const id in style.sources) {
         const source = style.sources[id];
@@ -21,7 +20,6 @@ export default function (style) {
     }
 
     if (styleIDs.length < 2)
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return style;
 
     styleIDs.forEach((id) => {
@@ -49,6 +47,5 @@ export default function (style) {
         }
     });
 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return style;
 }

package/dist/index.cjs

@@ -1513,6 +1513,29 @@
   	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 = [
@@ -2704,6 +2727,7 @@
   		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"
   		],
@@ -2847,6 +2871,8 @@
   		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",
@@ -2874,6 +2900,7 @@
   		period: 360,
   		units: "degrees",
   		doc: "Rotates the icon clockwise.",
+  		appearance: true,
   		requires: [
   			"icon-image"
   		],
@@ -2962,6 +2989,7 @@
   			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"
   		],
@@ -10188,6 +10216,7 @@
   	source_image: source_image,
   	source_model: source_model,
   	layer: layer,
+  	appearance: appearance,
   	layout: layout,
   	layout_background: layout_background,
   	layout_sky: layout_sky,
@@ -14016,7 +14045,7 @@
       'Polygon'
   ];
   class EvaluationContext {
-      constructor(scope, options) {
+      constructor(scope, options, iconImageUseTheme) {
           this.globals = null;
           this.feature = null;
           this.featureState = null;
@@ -14028,6 +14057,7 @@
           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;
@@ -14116,7 +14146,7 @@
                   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++) {
@@ -16252,7 +16282,7 @@
   }
 
   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 => {
@@ -16266,6 +16296,7 @@
           this.expectedType = expectedType;
           this._scope = _scope;
           this.options = options;
+          this.iconImageUseTheme = iconImageUseTheme;
       }
       /**
      * @param expr the JSON expression to parse
@@ -16328,7 +16359,7 @@
                       }
                   }
                   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) {
@@ -16362,7 +16393,7 @@
           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`
@@ -18006,7 +18037,6 @@
           overloads: [
               [
                   [StringType],
-                  // eslint-disable-next-line @typescript-eslint/no-unsafe-return
                   (ctx, [key]) => get(key.evaluate(ctx), ctx.properties())
               ],
               [
@@ -18022,7 +18052,6 @@
       'feature-state': [
           ValueType,
           [StringType],
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-return
           (ctx, [key]) => get(key.evaluate(ctx), ctx.featureState || {})
       ],
       'properties': [
@@ -18748,10 +18777,10 @@
   }
 
   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);
@@ -18767,7 +18796,7 @@
           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;
@@ -18776,6 +18805,7 @@
           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) {
@@ -18799,13 +18829,13 @@
   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) {
@@ -18819,8 +18849,8 @@
       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 {
@@ -18848,8 +18878,8 @@
           }
       }
   }
-  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;
       }
@@ -18905,11 +18935,11 @@
           };
       }
   }
-  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(', '));
           }
@@ -19808,11 +19838,11 @@ ${ JSON.stringify(filterExp, null, 2) }
           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;
   }
@@ -21096,7 +21126,7 @@ ${ JSON.stringify(filterExp, null, 2) }
       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({
@@ -21115,7 +21145,6 @@ ${ JSON.stringify(filterExp, null, 2) }
                   },
                   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
@@ -21174,7 +21203,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
@@ -21827,9 +21855,7 @@ Use an identity property function instead: ${ example }.`)];
   }
 
   const VALIDATORS = {
-      '*'() {
-          return [];
-      },
+      '*': () => [],
       'array': validateArray,
       'boolean': validateBoolean,
       'number': validateNumber,