@mapbox/mapbox-gl-style-spec 14.16.0-beta.2 → 14.16.0

package/dist/index.d.ts

@@ -441,14 +441,17 @@ type ImportSpecification = {
 	"color-theme"?: ColorThemeSpecification | null | undefined;
 };
 type IndoorSpecification = {
+	[_: string]: IndoorSourceSpecification;
+};
+type IndoorSourceSpecification = {
 	/**
 	 * @experimental This property is experimental and subject to change in future versions.
 	 */
-	"floorplanFeaturesetId"?: ExpressionSpecification;
+	"sourceId"?: string;
 	/**
 	 * @experimental This property is experimental and subject to change in future versions.
 	 */
-	"buildingFeaturesetId"?: ExpressionSpecification;
+	"sourceLayers"?: Array<string>;
 };
 type ConfigSpecification = {
 	[_: string]: unknown;
@@ -2065,7 +2068,10 @@ interface GlobalProperties {
 }
 declare class StyleExpression {
 	expression: Expression;
-	_evaluator: EvaluationContext;
+	_scope?: string;
+	_options?: ConfigOptions;
+	_iconImageUseTheme?: string;
+	_evaluator?: EvaluationContext;
 	_defaultValue: Value;
 	_warningHistory: {
 		[key: string]: boolean;

package/dist/index.es.js

@@ -127,6 +127,7 @@ var $root = {
 	},
 	indoor: {
 		type: "indoor",
+		"private": true,
 		experimental: true,
 		doc: "Controls the behaviour of indoor features."
 	},
@@ -831,7 +832,7 @@ var source_vector = {
 	},
 	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",
@@ -1197,7 +1198,7 @@ var source_geojson = {
 	},
 	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",
@@ -1641,7 +1642,7 @@ var layer = {
 			"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."
+		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 = {
@@ -5603,6 +5604,7 @@ var expression_name = {
 			doc: "Experimental. Returns `true` if the input floor id belongs to one of the active indoor floors, `false` otherwise. In case of array of strings, returns `true` if any of the input floor ids belongs to one of the active indoor floors, `false` otherwise. Only supported in filters.",
 			group: "Indoor",
 			experimental: true,
+			"private": true,
 			"sdk-support": {
 				"basic functionality": {
 					js: "3.16.0",
@@ -6470,26 +6472,29 @@ var colorTheme = {
 		}
 	}
 };
-var indoor = {
-	floorplanFeaturesetId: {
+var indoor_source = {
+	sourceId: {
 		type: "string",
-		doc: "An ID of a featureset to be used to query indoor floorplans.",
+		doc: "Source ID of a source to be used to retrieve indoor data.",
 		experimental: true,
+		"private": true,
 		transition: false,
-		"property-type": "data-constant",
-		expression: {
-			interpolated: false
-		}
+		"property-type": "data-constant"
 	},
-	buildingFeaturesetId: {
-		type: "string",
-		doc: "An ID of a featureset to be used to add interactivity for building selection.",
+	sourceLayers: {
+		type: "array",
+		value: "string",
+		doc: "An array of source layers to be used to retrieve indoor data.",
 		experimental: true,
+		"private": true,
 		transition: false,
-		"property-type": "data-constant",
-		expression: {
-			interpolated: false
-		}
+		"property-type": "data-constant"
+	}
+};
+var indoor = {
+	"*": {
+		type: "indoor_source",
+		doc: "Specification of an indoor source - sourceId and sourceLayer required for vector source, for GeoJSON sourceLayers should be omitted."
 	}
 };
 var light = {
@@ -10565,7 +10570,7 @@ var transition = {
 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 = {
@@ -10907,6 +10912,7 @@ var v8 = {
 	rain: rain,
 	camera: camera,
 	colorTheme: colorTheme,
+	indoor_source: indoor_source,
 	indoor: indoor,
 	light: light,
 	projection: projection,
@@ -14117,8 +14123,7 @@ class FormatExpression {
             }
             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));
@@ -16427,8 +16432,7 @@ function linesToGeometryDistance(originGeometry, canonical, geometry) {
     }
     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;
@@ -16465,8 +16469,7 @@ function polygonsToGeometryDistance(originGeometry, canonical, geometry) {
     }
     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;
@@ -16480,8 +16483,7 @@ function polygonsToGeometryDistance(originGeometry, canonical, geometry) {
         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;
 }
@@ -17420,11 +17422,8 @@ class Coalesce {
             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) {
@@ -19358,6 +19357,9 @@ class StyleExpression {
     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;
@@ -19376,6 +19378,9 @@ class StyleExpression {
         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;
@@ -21637,14 +21642,12 @@ function validateNonExpressionFilter(options) {
     case '<':
     case '<=':
     case '>':
-    // @ts-expect-error - falls through
     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 '==':
-    // @ts-expect-error - falls through
     case '!=':
         if (value.length !== 3) {
             errors.push(new ValidationError(key, value, `filter array for operator "${ value[0] }" must have 3 elements`));
@@ -21706,16 +21709,16 @@ function validateProperty(options, propertyType) {
         return [];
     const useThemeMatch = propertyKey.match(/^(.*)-use-theme$/);
     if (useThemeMatch && layerSpec[useThemeMatch[1]]) {
-        if (isExpression(value)) {
+        if (isExpression(deepUnbundle(value))) {
             const errors2 = [];
             return errors2.concat(validate({
-                key: options.key,
+                key,
                 value,
                 valueSpec: {
-                    'type': 'string',
-                    'expression': {
-                        'interpolated': false,
-                        'parameters': [
+                    type: 'string',
+                    expression: {
+                        interpolated: false,
+                        parameters: [
                             'zoom',
                             'feature'
                         ]
@@ -21769,7 +21772,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.`));
@@ -21780,7 +21784,6 @@ Use an identity property function instead: ${ example }.`)];
     return errors.concat(validate({
         key: options.key,
         value,
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         valueSpec,
         style,
         styleSpec,
@@ -21812,7 +21815,7 @@ function validateAppearance(options) {
             }, options2))
         }
     });
-    if (name !== 'hidden' && !condition) {
+    if (name !== 'hidden' && condition === void 0) {
         errors.push(new ValidationError(options.key, 'name', `Appearance with name different than "hidden" must have a condition`));
     }
     return errors;
@@ -21836,7 +21839,6 @@ function validateProperties(options) {
             layer,
             layerType,
             value: properties[propertyKey],
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
             valueSpec: propertyType === 'paint' ? paintProperties[propertyKey] : layoutProperties[propertyKey]
         });
         errors.push(...validateProperty(propertyValidationOptions, propertyType));
@@ -21850,7 +21852,6 @@ function validateCondition(options) {
     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'
     }));
@@ -22153,10 +22154,11 @@ function validateSource(options) {
     }
 }
 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;
     }, []);
@@ -22517,7 +22519,6 @@ function validateProjection(options) {
             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
@@ -22658,7 +22659,8 @@ function validateObject(options) {
         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 }"`));
         }
     }