@mapbox/mapbox-gl-style-spec 14.16.0-beta.3 → 14.16.1

package/diff.ts

@@ -629,8 +629,7 @@ export default function diffStyles(before: StyleSpecification, after: StyleSpeci
         const sourcesRemoved: Record<string, true> = {};
 
         // First collect the {add,remove}Source commands
-        const removeOrAddSourceCommands = [];
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+        const removeOrAddSourceCommands: Command[] = [];
         diffSources(before.sources, after.sources, removeOrAddSourceCommands, sourcesRemoved);
 
         // Push a removeLayer command for each style layer that depends on a
@@ -638,7 +637,7 @@ export default function diffStyles(before: StyleSpecification, after: StyleSpeci
         // Also, exclude any such layers them from the input to `diffLayers`
         // below, so that diffLayers produces the appropriate `addLayers`
         // command
-        const beforeLayers = [];
+        const beforeLayers: LayerSpecification[] = [];
         if (before.layers) {
             before.layers.forEach((layer) => {
                 if (layer.source && sourcesRemoved[layer.source]) {
@@ -667,7 +666,7 @@ export default function diffStyles(before: StyleSpecification, after: StyleSpeci
         }
 
         // Handle changes to `layers`
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+
         diffLayers(beforeLayers, after.layers, commands);
     } catch (e) {
         // fall back to setStyle

package/dist/index.cjs

@@ -838,7 +838,7 @@
   	},
   	promoteId: {
   		type: "promoteId",
-  		doc: "A property to use as a feature id (for feature state). Either a property name, or an object of the form `{<sourceLayer>: <propertyName>}`. If specified as a string for a vector tile source, the same property is used across all its source layers. If specified as an object only specified source layers will have id overriden, others will fallback to original feature id"
+  		doc: "A property to use as a feature id (for feature state). It can be a property name, or an expression to evaluate as the ID, or an object of the form `{<sourceLayer>: <propertyName/expression>}`. The expression can only be feature dependent if it is used. If specified as a string for a vector tile source, the same property is used across all its source layers. If specified as an object only specified source layers will have id overriden, others will fallback to original feature id"
   	},
   	volatile: {
   		type: "boolean",
@@ -1204,7 +1204,7 @@
   	},
   	promoteId: {
   		type: "promoteId",
-  		doc: "A property to use as a feature id (for feature state). Either a property name, or an object of the form `{<sourceLayer>: <propertyName>}`."
+  		doc: "A property to use as a feature id (for feature state). Either a property name, an expression to evaluate as the ID, or an object of the form `{<sourceLayer>: <propertyName/expression>}`. The expression can only be feature dependent if it is used."
   	},
   	dynamic: {
   		type: "boolean",
@@ -1647,8 +1647,8 @@
   		"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."
+  		experimental: true,
+  		doc: "Conditional styling applied to symbol layer features based on dynamic conditions. If multiple conditions are true, only the first matching appearance will be applied. Only properties marked with 'Works with appearances' are supported."
   	}
   };
   var appearance = {
@@ -1656,7 +1656,7 @@
   		type: "boolean",
   		doc: "A boolean expression that determines when this appearance should be applied.",
   		expression: {
-  			interpolated: false,
+  			interpolated: true,
   			parameters: [
   				"zoom",
   				"pitch",
@@ -6500,6 +6500,8 @@
   var indoor = {
   	"*": {
   		type: "indoor_source",
+  		"private": true,
+  		experimental: true,
   		doc: "Specification of an indoor source - sourceId and sourceLayer required for vector source, for GeoJSON sourceLayers should be omitted."
   	}
   };
@@ -10576,7 +10578,7 @@
   var promoteId = {
   	"*": {
   		type: "*",
-  		doc: "A feature property name to use as the ID, or an expression to evaluate as the ID for feature state."
+  		doc: "A feature property name to use as the ID, or an expression to evaluate as the ID for feature state. The expression can only be feature dependent if it is used."
   	}
   };
   var $doc = {
@@ -14129,8 +14131,7 @@
               }
               return new FormattedSection(// eslint-disable-next-line @typescript-eslint/no-unsafe-argument
               toString(evaluatedContent), null, // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-              section.scale ? section.scale.evaluate(ctx) : null, // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-              section.font ? section.font.evaluate(ctx).join(',') : null, // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+              section.scale ? section.scale.evaluate(ctx) : null, section.font ? section.font.evaluate(ctx).join(',') : null, // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
               section.textColor ? section.textColor.evaluate(ctx) : null);
           };
           return new Formatted(this.sections.map(evaluateSection));
@@ -16439,8 +16440,7 @@
       }
       const ruler = new CheapRuler(lngLatLines[0][0][1], 'meters');
       if (geometry.type === 'Point' || geometry.type === 'MultiPoint' || geometry.type === 'LineString') {
-          return pointSetToLinesDistance(geometry.type === 'Point' ? [geometry.coordinates] : geometry.coordinates, // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-          geometry.type === 'LineString', lngLatLines, ruler);
+          return pointSetToLinesDistance(geometry.type === 'Point' ? [geometry.coordinates] : geometry.coordinates, geometry.type === 'LineString', lngLatLines, ruler);
       }
       if (geometry.type === 'MultiLineString') {
           let dist = Infinity;
@@ -16477,8 +16477,7 @@
       }
       const ruler = new CheapRuler(lngLatPolygons[0][0][0][1], 'meters');
       if (geometry.type === 'Point' || geometry.type === 'MultiPoint' || geometry.type === 'LineString') {
-          return pointSetToPolygonsDistance(geometry.type === 'Point' ? [geometry.coordinates] : geometry.coordinates, // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-          geometry.type === 'LineString', lngLatPolygons, ruler);
+          return pointSetToPolygonsDistance(geometry.type === 'Point' ? [geometry.coordinates] : geometry.coordinates, geometry.type === 'LineString', lngLatPolygons, ruler);
       }
       if (geometry.type === 'MultiLineString') {
           let dist = Infinity;
@@ -16492,8 +16491,7 @@
           return dist;
       }
       if (geometry.type === 'Polygon' || geometry.type === 'MultiPolygon') {
-          return polygonsToPolygonsDistance(geometry.type === 'Polygon' ? [geometry.coordinates] : geometry.coordinates, // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-          lngLatPolygons, ruler);
+          return polygonsToPolygonsDistance(geometry.type === 'Polygon' ? [geometry.coordinates] : geometry.coordinates, lngLatPolygons, ruler);
       }
       return null;
   }
@@ -17432,11 +17430,8 @@
               outputType = outputType || parsed.type;
               parsedArgs.push(parsed);
           }
-          const needsAnnotation = expectedType && // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
-          parsedArgs.some(arg => checkSubtype(expectedType, arg.type));
-          return needsAnnotation ? // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-          new Coalesce(ValueType, parsedArgs) : // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
-          new Coalesce(outputType, parsedArgs);
+          const needsAnnotation = expectedType && parsedArgs.some(arg => checkSubtype(expectedType, arg.type));
+          return needsAnnotation ? new Coalesce(ValueType, parsedArgs) : new Coalesce(outputType, parsedArgs);
       }
       // eslint-disable-next-line @typescript-eslint/no-explicit-any
       evaluate(ctx) {
@@ -19370,6 +19365,9 @@
       constructor(expression, propertySpec, scope, options, iconImageUseTheme) {
           this.expression = expression;
           this._warningHistory = {};
+          this._scope = scope;
+          this._options = options;
+          this._iconImageUseTheme = iconImageUseTheme;
           this._evaluator = new EvaluationContext(scope, options, iconImageUseTheme);
           this._defaultValue = propertySpec ? getDefaultValue(propertySpec) : null;
           this._enumValues = propertySpec && propertySpec.type === 'enum' ? propertySpec.values : null;
@@ -19388,6 +19386,9 @@
           return this.expression.evaluate(this._evaluator);
       }
       evaluate(globals, feature, featureState, canonical, availableImages, formattedSection, featureTileCoord, featureDistanceData, iconImageUseTheme) {
+          if (!this._evaluator) {
+              this._evaluator = new EvaluationContext(this._scope, this._options, this._iconImageUseTheme);
+          }
           this._evaluator.globals = globals;
           this._evaluator.feature = feature || null;
           this._evaluator.featureState = featureState || null;
@@ -21645,23 +21646,7 @@ ${ JSON.stringify(filterExp, null, 2) }
           // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
           valueSpec: styleSpec.filter_operator
       });
-      switch (unbundle(value[0])) {
-      case '<':
-      case '<=':
-      case '>':
-      case '>=':
-          if (value.length >= 2 && unbundle(value[1]) === '$type') {
-              errors.push(new ValidationError(key, value, `"$type" cannot be use with operator "${ value[0] }"`));
-          }
-      /* falls through */
-      case '==':
-      case '!=':
-          if (value.length !== 3) {
-              errors.push(new ValidationError(key, value, `filter array for operator "${ value[0] }" must have 3 elements`));
-          }
-      /* falls through */
-      case 'in':
-      case '!in':
+      const validate = () => {
           if (value.length >= 2) {
               if (!isString(value[1])) {
                   errors.push(new ValidationError(`${ key }[1]`, value[1], `string expected, ${ getType(value[1]) } found`));
@@ -21679,6 +21664,30 @@ ${ JSON.stringify(filterExp, null, 2) }
                   errors.push(new ValidationError(`${ key }[${ i }]`, value[i], `string, number, or boolean expected, ${ getType(value[i]) } found.`));
               }
           }
+      };
+      switch (unbundle(value[0])) {
+      case '<':
+      case '<=':
+      case '>':
+      case '>=':
+          if (value.length >= 2 && unbundle(value[1]) === '$type') {
+              errors.push(new ValidationError(key, value, `"$type" cannot be use with operator "${ value[0] }"`));
+          }
+          if (value.length !== 3) {
+              errors.push(new ValidationError(key, value, `filter array for operator "${ value[0] }" must have 3 elements`));
+          }
+          validate();
+          break;
+      case '==':
+      case '!=':
+          if (value.length !== 3) {
+              errors.push(new ValidationError(key, value, `filter array for operator "${ value[0] }" must have 3 elements`));
+          }
+          validate();
+          break;
+      case 'in':
+      case '!in':
+          validate();
           break;
       case 'any':
       case 'all':
@@ -21779,7 +21788,8 @@ Use an identity property function instead: ${ example }.`)];
       } else if (options.layerType === 'model' && propertyType === 'paint' && layer && layer.layout && layer.layout.hasOwnProperty('model-id')) {
           if (supportsPropertyExpression(valueSpec) && (supportsLightExpression(valueSpec) || supportsZoomExpression(valueSpec))) {
               const expression = createPropertyExpression(deepUnbundle(value), valueSpec);
-              const expressionObj = expression.value.expression || expression.value._styleExpression.expression;
+              const expressionValue = expression.value;
+              const expressionObj = 'expression' in expressionValue && expressionValue.expression || '_styleExpression' in expressionValue && expressionValue._styleExpression && expressionValue._styleExpression.expression;
               if (expressionObj && !isGlobalPropertyConstant(expressionObj, ['measure-light'])) {
                   if (propertyKey !== 'model-emissive-strength' || (!isFeatureConstant(expressionObj) || !isStateConstant(expressionObj))) {
                       errors.push(new ValidationError(key, value, `${ propertyKey } does not support measure-light expressions when the model layer source is vector tile or GeoJSON.`));
@@ -21858,7 +21868,6 @@ Use an identity property function instead: ${ example }.`)];
       errors.push(...validateExpression({
           key: options.key,
           value: condition,
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
           valueSpec: v8['appearance']['condition'],
           expressionContext: 'appearance'
       }));
@@ -22161,10 +22170,11 @@ Use an identity property function instead: ${ example }.`)];
       }
   }
   function getSourceTypeValues(styleSpec) {
-      return styleSpec.source.reduce((memo, source) => {
+      const sourceArray = styleSpec.source;
+      return sourceArray.reduce((memo, source) => {
           const sourceType = styleSpec[source];
           if (sourceType.type.type === 'enum') {
-              memo = memo.concat(Object.keys(sourceType.type.values));
+              memo = memo.concat(Object.keys(sourceType.type.values || {}));
           }
           return memo;
       }, []);
@@ -22525,7 +22535,6 @@ Use an identity property function instead: ${ example }.`)];
               errors = errors.concat(validate({
                   key,
                   value: projection[key],
-                  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
                   valueSpec: projectionSpec[key],
                   style,
                   styleSpec
@@ -22666,7 +22675,8 @@ Use an identity property function instead: ${ example }.`)];
           if (elementValidators[elementSpecKey]) {
               continue;
           }
-          if (elementSpecs[elementSpecKey].required && elementSpecs[elementSpecKey]['default'] === void 0 && object[elementSpecKey] === void 0) {
+          const elementSpec = elementSpecs[elementSpecKey];
+          if (elementSpec.required && elementSpec['default'] === void 0 && object[elementSpecKey] === void 0) {
               errors.push(new ValidationError(key, object, `missing required property "${ elementSpecKey }"`));
           }
       }
@@ -23879,7 +23889,6 @@ Use an identity property function instead: ${ example }.`)];
   }
   function getImportErrors(imports = []) {
       let errors = [];
-      let sourcesCount = 0;
       const validateImports = (imports2 = []) => {
           for (const importSpec of imports2) {
               const style = importSpec.data;
@@ -23891,7 +23900,6 @@ Use an identity property function instead: ${ example }.`)];
               errors = errors.concat(getRootErrors(style, Object.keys(v8.$root)));
               if (style.sources) {
                   const sourcesErrors = getSourcesErrors(style.sources);
-                  sourcesCount += sourcesErrors.sourcesCount;
                   errors = errors.concat(sourcesErrors.errors);
               }
           }
@@ -23900,10 +23908,7 @@ Use an identity property function instead: ${ example }.`)];
       if (imports.length !== new Set(imports.map(i => i.id)).size) {
           errors.push(new ValidationError(null, null, 'Duplicate ids of imports'));
       }
-      return {
-          errors,
-          sourcesCount
-      };
+      return errors;
   }
   function getRootErrors(style, specKeys) {
       const errors = [];
@@ -23960,8 +23965,7 @@ Use an identity property function instead: ${ example }.`)];
       }
       if (s.imports) {
           const importsErrors = getImportErrors(s.imports);
-          sourcesCount += importsErrors.sourcesCount;
-          errors = errors.concat(importsErrors.errors);
+          errors = errors.concat(importsErrors);
       }
       errors = errors.concat(getMaxSourcesErrors(sourcesCount));
       return errors;