@mapbox/mapbox-gl-style-spec 14.5.2 → 14.6.0

package/expression/definitions/assertion.ts

@@ -34,9 +34,8 @@ class Assertion implements Expression {
         this.args = args;
     }
 
-    static parse(args: ReadonlyArray<unknown>, context: ParsingContext): Expression | null | undefined {
+    static parse(args: ReadonlyArray<unknown>, context: ParsingContext): Expression | void {
         if (args.length < 2)
-        // @ts-expect-error - TS2322 - Type 'void' is not assignable to type 'Expression'.
             return context.error(`Expected at least one argument.`);
 
         let i = 1;
@@ -48,7 +47,6 @@ class Assertion implements Expression {
             if (args.length > 2) {
                 const type = args[1];
                 if (typeof type !== 'string' || !(type in types) || type === 'object')
-                // @ts-expect-error - TS2322 - Type 'void' is not assignable to type 'Expression'.
                     return context.error('The item type argument of "array" must be one of string, number, boolean', 1);
                 itemType = types[type];
                 i++;
@@ -63,7 +61,6 @@ class Assertion implements Expression {
                         args[2] < 0 ||
                         args[2] !== Math.floor(args[2]))
                 ) {
-                    // @ts-expect-error - TS2322 - Type 'void' is not assignable to type 'Expression'.
                     return context.error('The length argument to "array" must be a positive integer literal', 2);
                 }
                 N = (args[2] as number);
@@ -93,7 +90,7 @@ class Assertion implements Expression {
             if (!error) {
                 return value;
             } else if (i === this.args.length - 1) {
-                throw new RuntimeError(`Expected value to be of type ${toString(this.type)}, but found ${toString(typeOf(value))} instead.`);
+                throw new RuntimeError(`The expression ${JSON.stringify(this.args[i].serialize())} evaluated to ${toString(typeOf(value))} but was expected to be of type ${toString(this.type)}.`);
             }
         }
 

package/expression/index.ts

@@ -133,7 +133,7 @@ export class StyleExpression {
             if (!this._warningHistory[e.message]) {
                 this._warningHistory[e.message] = true;
                 if (typeof console !== 'undefined') {
-                    console.warn(e.message);
+                    console.warn(`Failed to evaluate expression "${JSON.stringify(this.expression.serialize())}". ${e.message}`);
                 }
             }
             return this._defaultValue;
@@ -178,7 +178,7 @@ export function createExpression(
 export class ZoomConstantExpression<Kind extends EvaluationKind> {
     kind: Kind;
     isStateDependent: boolean;
-    isConfigDependent: boolean;
+    configDependencies: Set<string>;
     _styleExpression: StyleExpression;
     isLightConstant: boolean | null | undefined;
 
@@ -187,7 +187,7 @@ export class ZoomConstantExpression<Kind extends EvaluationKind> {
         this._styleExpression = expression;
         this.isLightConstant = isLightConstant;
         this.isStateDependent = kind !== ('constant' as EvaluationKind) && !isConstant.isStateConstant(expression.expression);
-        this.isConfigDependent = !isConstant.isConfigConstant(expression.expression);
+        this.configDependencies = isConstant.getConfigDependencies(expression.expression);
     }
 
     evaluateWithoutErrorHandling(
@@ -218,7 +218,7 @@ export class ZoomDependentExpression<Kind extends EvaluationKind> {
     zoomStops: Array<number>;
     isStateDependent: boolean;
     isLightConstant: boolean | null | undefined;
-    isConfigDependent: boolean;
+    configDependencies: Set<string>;
 
     _styleExpression: StyleExpression;
     interpolationType: InterpolationType | null | undefined;
@@ -229,7 +229,7 @@ export class ZoomDependentExpression<Kind extends EvaluationKind> {
         this._styleExpression = expression;
         this.isStateDependent = kind !== ('camera' as EvaluationKind) && !isConstant.isStateConstant(expression.expression);
         this.isLightConstant = isLightConstant;
-        this.isConfigDependent = !isConstant.isConfigConstant(expression.expression);
+        this.configDependencies = isConstant.getConfigDependencies(expression.expression);
         this.interpolationType = interpolationType;
     }
 
@@ -266,7 +266,7 @@ export class ZoomDependentExpression<Kind extends EvaluationKind> {
 
 export type ConstantExpression = {
     kind: 'constant';
-    isConfigDependent: boolean;
+    configDependencies: Set<string>;
     readonly evaluate: (
         globals: GlobalProperties,
         feature?: Feature,
@@ -280,7 +280,7 @@ export type SourceExpression = {
     kind: 'source';
     isStateDependent: boolean;
     isLightConstant: boolean | null | undefined;
-    isConfigDependent: boolean;
+    configDependencies: Set<string>;
     readonly evaluate: (
         globals: GlobalProperties,
         feature?: Feature,
@@ -294,7 +294,7 @@ export type SourceExpression = {
 export type CameraExpression = {
     kind: 'camera';
     isStateDependent: boolean;
-    isConfigDependent: boolean;
+    configDependencies: Set<string>;
     readonly evaluate: (
         globals: GlobalProperties,
         feature?: Feature,
@@ -311,7 +311,7 @@ export interface CompositeExpression {
     kind: 'composite';
     isStateDependent: boolean;
     isLightConstant: boolean | null | undefined;
-    isConfigDependent: boolean;
+    configDependencies: Set<string>;
     readonly evaluate: (
         globals: GlobalProperties,
         feature?: Feature,
@@ -449,7 +449,7 @@ export function normalizePropertyExpression<T>(
         }
         return {
             kind: 'constant',
-            isConfigDependent: false,
+            configDependencies: new Set(),
             evaluate: () => constant
         };
     }

package/expression/is_constant.ts

@@ -51,14 +51,15 @@ function isStateConstant(e: Expression): boolean {
     return result;
 }
 
-function isConfigConstant(e: Expression): boolean {
+function getConfigDependencies(e: Expression): Set<string> {
     if (e instanceof Config) {
-        return false;
+        const singleConfig = new Set([e.key]);
+        return singleConfig;
     }
 
-    let result = true;
+    let result = new Set<string>();
     e.eachChild(arg => {
-        if (result && !isConfigConstant(arg)) { result = false; }
+        result = new Set([...result, ...getConfigDependencies(arg)]);
     });
     return result;
 }
@@ -72,4 +73,4 @@ function isGlobalPropertyConstant(e: Expression, properties: Array<string>): boo
     return result;
 }
 
-export {isFeatureConstant, isGlobalPropertyConstant, isStateConstant, isConfigConstant};
+export {isFeatureConstant, isGlobalPropertyConstant, isStateConstant, getConfigDependencies};

package/feature_filter/convert.ts

@@ -91,18 +91,18 @@ function _convertFilter(filter: FilterSpecification, expectedTypes: ExpectedType
         });
         return ['any'].concat(children);
     } else if (op === 'all') {
-        const children = (filter as any).slice(1).map(f => _convertFilter(f, expectedTypes));
+        const children: any[] = (filter).slice(1).map(f => _convertFilter(f, expectedTypes));
         return children.length > 1 ? ['all'].concat(children) : [].concat(...children);
     } else if (op === 'none') {
-        return ['!', _convertFilter(['any'].concat((filter as any).slice(1)), {})];
+        return ['!', _convertFilter(['any'].concat((filter).slice(1)), {})];
     } else if (op === 'in') {
-        converted = convertInOp((filter[1] as any), filter.slice(2));
+        converted = convertInOp((filter[1]), filter.slice(2));
     } else if (op === '!in') {
-        converted = convertInOp((filter[1] as any), filter.slice(2), true);
+        converted = convertInOp((filter[1]), filter.slice(2), true);
     } else if (op === 'has') {
-        converted = convertHasOp((filter[1] as any));
+        converted = convertHasOp((filter[1]));
     } else if (op === '!has') {
-        converted = ['!', convertHasOp((filter[1] as any))];
+        converted = ['!', convertHasOp((filter[1]))];
     } else {
         converted = true;
     }
@@ -164,7 +164,7 @@ function convertComparisonOp(property: string, value: any, op: string, expectedT
 function convertInOp(property: string, values: Array<any>, negate: boolean = false) {
     if (values.length === 0) return negate;
 
-    let get;
+    let get: string[];
     if (property === '$type') {
         get = ['geometry-type'];
     } else if (property === '$id') {
@@ -192,9 +192,8 @@ function convertInOp(property: string, values: Array<any>, negate: boolean = fal
         return ['match', get, uniqueValues, !negate, negate];
     }
 
-    return [ negate ? 'all' : 'any' ].concat(
-        // @ts-expect-error - TS2769 - No overload matches this call.
-        values.map(v => [negate ? '!=' : '==', get, v])
+    return [negate ? 'all' : 'any'].concat(
+        values.map(v => [negate ? '!=' : '==', get, v]) as any[]
     );
 }
 

package/feature_filter/index.ts

@@ -82,7 +82,7 @@ function isExpressionFilter(filter: unknown): boolean {
  * @param {string} layerType the type of the layer this filter will be applied to.
  * @returns {Function} filter-evaluating function
  */
-function createFilter(filter?: FilterSpecification | ExpressionSpecification, layerType: string = 'fill'): FeatureFilter {
+function createFilter(filter?: FilterSpecification, layerType: string = 'fill'): FeatureFilter {
     if (filter === null || filter === undefined) {
         return {filter: () => true, needGeometry: false, needFeature: false};
     }

package/package.json

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

package/reference/v8.json

@@ -1485,6 +1485,24 @@
       },
       "property-type": "data-constant",
       "experimental": true
+    },
+    "clip-layer-scope": {
+      "type": "array",
+      "value": "string",
+      "default": [],
+      "doc": "Removes content from layers with the specified scope. By default all layers are affected. For example specifying `basemap` will only remove content from the Mapbox Standard style layers which have the same scope",
+      "sdk-support": {
+        "basic functionality": {
+          "js": "3.6.0",
+          "android": "11.7.0",
+          "ios": "11.7.0"
+        }
+      },
+      "expression": {
+        "interpolated": false
+      },
+      "property-type": "data-constant",
+      "experimental": true
     }
   },
   "layout_fill": {
@@ -5968,7 +5986,58 @@
         ]
       },
       "property-type": "data-constant"
-   }
+    },
+    "fill-extrusion-line-width": {
+      "type": "number",
+      "default": 0,
+      "minimum": 0,
+      "transition": true,
+      "units": "meters",
+      "doc": "If a non-zero value is provided, it sets the fill-extrusion layer into wall rendering mode. The value is used to render the feature with the given width over the outlines of the geometry. Note: This property is experimental and some other fill-extrusion properties might not be supported with non-zero line width.",
+      "sdk-support": {
+        "basic functionality": {
+          "js": "3.7.0"
+        },
+        "data-driven styling": {
+          "js": "3.7.0"
+        }
+      },
+      "expression": {
+        "interpolated": true,
+        "parameters": [
+          "zoom",
+          "feature",
+          "feature-state",
+          "measure-light"
+        ]
+      },
+      "property-type": "data-driven"
+    },
+    "fill-extrusion-line-alignment": {
+      "type": "enum",
+      "values": {
+        "inside": {
+          "doc": "Aligns the wall inside of the outline."
+        },
+        "outside": {
+          "doc": "Aligns the wall outside of the outline."
+        },
+        "center": {
+          "doc": "Aligns the wall relative to the center of the outline."
+        }
+      },
+      "default": "center",
+      "doc": "Specifies the alignment for offset of the walls relative to the outlines of the geometry. For open-ended line string geometries the positioning is considered based on the ordering of the points, where inside is in clockwise order and outside is counter-clockwise. This property only has an effect if a non-zero fill-extrusion-line-width is used. Center alignment is automatically used for non-closed lines.",
+      "requires": [
+        "fill-extrusion-line-width"
+      ],
+      "sdk-support": {
+        "basic functionality": {
+          "js": "3.7.0"
+        }
+      },
+      "property-type": "data-constant"
+    }
   },
   "paint_line": {
     "line-opacity": {
@@ -6493,7 +6562,6 @@
       "default": 0,
       "minimum": 0,
       "maximum": 1,
-      "experimental": true,
       "doc": "Opacity multiplier (multiplies line-opacity value) of the line part that is occluded by 3D objects. Value 0 hides occluded part, value 1 means the same opacity as non-occluded part. The property is not supported when `line-opacity` has data-driven styling.",
       "sdk-support": {
         "basic functionality": {
@@ -6574,7 +6642,7 @@
     "circle-blur": {
       "type": "number",
       "default": 0,
-      "doc": "Amount to blur the circle. 1 blurs the circle such that only the centerpoint is full opacity.",
+      "doc": "Amount to blur the circle. 1 blurs the circle such that only the centerpoint is full opacity. Setting a negative value renders the blur as an inner glow effect.",
       "transition": true,
       "sdk-support": {
         "basic functionality": {
@@ -7034,11 +7102,11 @@
       "property-type": "data-driven"
     },
     "icon-occlusion-opacity": {
-      "doc": "The opacity at which the icon will be drawn in case of being depth occluded. Not supported on globe zoom levels. Absent value means behavior prior to this property introduction.",
+      "doc": "The opacity at which the icon will be drawn in case of being depth occluded. Absent value means full occlusion against terrain only.",
       "type": "number",
       "minimum": 0,
       "maximum": 1,
-      "default": 1,
+      "default": 0,
       "transition": true,
       "requires": [
         "icon-image"
@@ -7384,10 +7452,10 @@
     },
     "text-occlusion-opacity": {
       "type": "number",
-      "doc": "The opacity at which the text will be drawn in case of being depth occluded. Not supported on globe zoom levels. Absent value means behavior prior to this property introduction.",
+      "doc": "The opacity at which the text will be drawn in case of being depth occluded. Absent value means full occlusion against terrain only.",
       "minimum": 0,
       "maximum": 1,
-      "default": 1,
+      "default": 0,
       "transition": true,
       "requires": [
         "text-field"
@@ -8142,6 +8210,27 @@
         }
       },
       "property-type": "data-constant"
+    },
+    "raster-particle-elevation": {
+      "type": "number",
+      "doc": "Specifies an uniform elevation from the ground, in meters.",
+      "default": 0,
+      "minimum": 0,
+      "transition": true,
+      "sdk-support": {
+        "basic functionality": {
+          "js": "3.7.0",
+          "android": "11.7.0",
+          "ios": "11.7.0"
+        }
+      },
+      "expression": {
+        "interpolated": true,
+        "parameters": [
+          "zoom"
+        ]
+      },
+      "property-type": "data-constant"
     }
   },
   "paint_hillshade": {
@@ -8809,9 +8898,6 @@
       "default": true,
       "doc": "Enable/Disable shadow casting for this layer",
       "transition": false,
-      "expression": {
-        "interpolated": false
-      },
       "sdk-support": {
           "basic functionality": {
           "js": "3.0.0",
@@ -8826,9 +8912,6 @@
       "default": true,
       "doc": "Enable/Disable shadow receiving for this layer",
       "transition": false,
-      "expression": {
-        "interpolated": false
-      },
       "sdk-support": {
           "basic functionality": {
           "js": "3.0.0",

package/types.ts

@@ -10,6 +10,7 @@ export type ResolvedImageSpecification = string;
 export type PromoteIdSpecification = {[_: string]: string} | string;
 
 export type FilterSpecification =
+    | ExpressionSpecification
     | ['has', string]
     | ['!has', string]
     | ['==', string, string | number | boolean]
@@ -70,7 +71,8 @@ export type DataDrivenPropertyValueSpecification<T> =
     | CameraFunctionSpecification<T>
     | SourceFunctionSpecification<T>
     | CompositeFunctionSpecification<T>
-    | ExpressionSpecification;
+    | ExpressionSpecification
+    | (T extends Array<infer U> ? Array<U | ExpressionSpecification> : never);
 
 export type StyleSpecification = {
     "version": 8,
@@ -698,7 +700,10 @@ export type FillExtrusionLayerSpecification = {
         "fill-extrusion-rounded-roof"?: PropertyValueSpecification<boolean>,
         "fill-extrusion-cutoff-fade-range"?: ExpressionSpecification,
         "fill-extrusion-emissive-strength"?: PropertyValueSpecification<number>,
-        "fill-extrusion-emissive-strength-transition"?: TransitionSpecification
+        "fill-extrusion-emissive-strength-transition"?: TransitionSpecification,
+        "fill-extrusion-line-width"?: DataDrivenPropertyValueSpecification<number>,
+        "fill-extrusion-line-width-transition"?: TransitionSpecification,
+        "fill-extrusion-line-alignment"?: "inside" | "outside" | "center"
     }
 }
 
@@ -788,7 +793,9 @@ export type RasterParticleLayerSpecification = {
         "raster-particle-speed-factor-transition"?: TransitionSpecification,
         "raster-particle-fade-opacity-factor"?: PropertyValueSpecification<number>,
         "raster-particle-fade-opacity-factor-transition"?: TransitionSpecification,
-        "raster-particle-reset-rate-factor"?: number
+        "raster-particle-reset-rate-factor"?: number,
+        "raster-particle-elevation"?: PropertyValueSpecification<number>,
+        "raster-particle-elevation-transition"?: TransitionSpecification
     }
 }
 
@@ -869,8 +876,8 @@ export type ModelLayerSpecification = {
         "model-color-mix-intensity"?: DataDrivenPropertyValueSpecification<number>,
         "model-color-mix-intensity-transition"?: TransitionSpecification,
         "model-type"?: "common-3d" | "location-indicator",
-        "model-cast-shadows"?: ExpressionSpecification,
-        "model-receive-shadows"?: ExpressionSpecification,
+        "model-cast-shadows"?: boolean,
+        "model-receive-shadows"?: boolean,
         "model-ambient-occlusion-intensity"?: PropertyValueSpecification<number>,
         "model-ambient-occlusion-intensity-transition"?: TransitionSpecification,
         "model-emissive-strength"?: DataDrivenPropertyValueSpecification<number>,
@@ -993,7 +1000,11 @@ export type ClipLayerSpecification = {
         /**
          * @experimental This property is experimental and subject to change in future versions.
          */
-        "clip-layer-types"?: ExpressionSpecification
+        "clip-layer-types"?: ExpressionSpecification,
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
+        "clip-layer-scope"?: ExpressionSpecification
     },
     "paint"?: never
 }