Merge branch 'main' into mlt

TimSylvester · web-flow · commit e32cf891575f · 2025-10-01T07:53:35.000-07:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,23 @@
 ### 🐞 Bug fixes
 - _...Add new stuff here..._
 
+## 24.2.0
+
+### ✨ Features and improvements
+
+- Add note regarding visual artifacts that can appear with large width/size/offset values on vector tile layers, highlight remediation options ([#4160](https://github.com/maplibre/maplibre-gl-js/issues/4160))
+- Implement data-driven styling support for `line-dasharray` ([#5812](https://github.com/mapbox/mapbox-gl-js/pull/5812))
+
+### 🐞 Bug fixes
+
+- Replace additional spread operator (`...`) due to esbuild limitations ([#1297](https://github.com/maplibre/maplibre-style-spec/pull/1297))
+
+## 24.1.1
+
+### 🐞 Bug fixes
+
+- Replace spread operator (`...`) due to esbuild limitations ([#1286](https://github.com/maplibre/maplibre-style-spec/pull/1286))
+
 ## 24.1.0
 
 ### ✨ Features and improvements
diff --git a/build/generate-docs.ts b/build/generate-docs.ts
@@ -355,7 +355,7 @@ function createLayersContent() {
 function createSourcesContent() {
     const sourcesExtraData = {
         vector: {
-            doc: 'A vector tile source. Tiles must be in [Mapbox Vector Tile format](https://github.com/mapbox/vector-tile-spec). All geometric coordinates in vector tiles must be between \`-1 * extent\` and \`(extent * 2) - 1\` inclusive. All layers that use a vector source must specify a [`source-layer`](layers.md#source-layer) value.',
+            doc: 'A vector tile source. Tiles must be in [Mapbox Vector Tile format](https://github.com/mapbox/vector-tile-spec). All geometric coordinates in vector tiles must be between \`-1 * extent\` and \`(extent * 2) - 1\` inclusive. All layers that use a vector source must specify a [`source-layer`](layers.md#source-layer) value. Note that features are only rendered within their originating tile, which may lead to visual artifacts when large values for width, radius, size or offset are specified. To mitigate rendering issues, either reduce the value of the property causing the artifact or, if you have control over the tile generation process, increase the buffer size to ensure that features are fully rendered within the tile.',
             example: {
                 'maplibre-streets': {
                     'type': 'vector',
diff --git a/eslint.config.js b/eslint.config.js
@@ -71,11 +71,6 @@ export default [{
         "no-lonely-if": "off",
         "no-new": "off",
 
-        "no-restricted-properties": [2, {
-            object: "Object",
-            property: "assign",
-        }],
-
         "no-unused-vars": "off",
         "no-warning-comments": "error",
         "object-curly-spacing": ["error", "never"],
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@maplibre/maplibre-gl-style-spec",
   "description": "a specification for maplibre styles",
-  "version": "24.1.0",
+  "version": "24.2.0",
   "author": "MapLibre",
   "keywords": [
     "mapbox",
@@ -69,21 +69,21 @@
     "@rollup/plugin-strip": "^3.0.4",
     "@rollup/plugin-terser": "^0.4.4",
     "@rollup/plugin-typescript": "^12.1.4",
-    "@stylistic/eslint-plugin": "^5.3.1",
+    "@stylistic/eslint-plugin": "^5.4.0",
     "@types/eslint": "^9.6.1",
     "@types/geojson": "^7946.0.16",
-    "@types/node": "^24.4.0",
-    "@typescript-eslint/eslint-plugin": "^8.43.0",
-    "@typescript-eslint/parser": "^8.42.0",
+    "@types/node": "^24.5.2",
+    "@typescript-eslint/eslint-plugin": "^8.44.1",
+    "@typescript-eslint/parser": "^8.44.1",
     "@vitest/coverage-v8": "3.2.4",
-    "@vitest/eslint-plugin": "^1.3.9",
+    "@vitest/eslint-plugin": "^1.3.13",
     "@vitest/ui": "3.2.4",
     "dts-bundle-generator": "^9.5.1",
-    "eslint": "^9.35.0",
-    "eslint-plugin-jsdoc": "^57.0.8",
+    "eslint": "^9.36.0",
+    "eslint-plugin-jsdoc": "^60.5.0",
     "glob": "^11.0.3",
     "globals": "^16.4.0",
-    "rollup": "^4.50.1",
+    "rollup": "^4.52.3",
     "rollup-plugin-preserve-shebang": "^1.0.1",
     "semver": "^7.7.2",
     "ts-node": "^10.9.2",
diff --git a/src/expression/index.test.ts b/src/expression/index.test.ts
@@ -1,11 +1,12 @@
 
-import {normalizePropertyExpression} from '.'
+import {normalizePropertyExpression, StyleExpression} from '.'
 import {StylePropertySpecification} from '..';
 import {Color} from './types/color';
 import {ColorArray} from './types/color_array';
 import {NumberArray} from './types/number_array';
 import {Padding} from './types/padding';
-import {describe, test, expect} from 'vitest';
+import type {Expression} from './expression';
+import {describe, test, expect, vi} from 'vitest';
 
 function stylePropertySpecification(type): StylePropertySpecification {
     return {
@@ -119,4 +120,28 @@ describe('normalizePropertyExpression raw values', () => {
         expect(expression.evaluate({zoom: 0}).values).toEqual([1,2,1,2]);
     })
 
+});
+
+describe('StyleExpressions', () => {
+
+    test('ignore random fields when adding global state ', () => {
+        const expression = {
+            evaluate: vi.fn()
+        } as any as Expression;
+        const styleExpression = new StyleExpression(expression, {
+            type: null,
+            default: 42,
+            'property-type': 'data-driven',
+            transition: false
+        } as StylePropertySpecification, {x: 5} as Record<string, any>);
+
+        styleExpression.evaluate({zoom: 10, a: 20, b: 30} as any);
+        expect(expression.evaluate).toHaveBeenCalled();
+        const params = (expression.evaluate as any).mock.calls[0][0].globals;
+        expect(params).toHaveProperty('zoom', 10);
+        expect(params).toHaveProperty('globalState', {x: 5});
+        expect(params).not.toHaveProperty('a');
+        expect(params).not.toHaveProperty('b');
+    });
+
 });
diff --git a/src/expression/index.ts b/src/expression/index.ts
@@ -51,6 +51,13 @@ export type Feature = {
             'max': string;
         };
     };
+    readonly dashes?: {
+        [_: string]: {
+            'min': string;
+            'mid': string;
+            'max': string;
+        };
+    };
     readonly geometry?: Array<Array<Point2D>>;
 };
 
@@ -93,7 +100,7 @@ export class StyleExpression {
         formattedSection?: FormattedSection
     ): any {
         if (this._globalState) {
-            globals = {...globals, globalState: this._globalState};
+            globals = addGlobalState(globals, this._globalState);
         }
         this._evaluator.globals = globals;
         this._evaluator.feature = feature;
@@ -114,7 +121,7 @@ export class StyleExpression {
         formattedSection?: FormattedSection
     ): any {
         if (this._globalState) {
-            globals = {...globals, globalState: this._globalState};
+            globals = addGlobalState(globals, this._globalState);
         }
         this._evaluator.globals = globals;
         this._evaluator.feature = feature || null;
@@ -196,7 +203,7 @@ export class ZoomConstantExpression<Kind extends EvaluationKind> {
         formattedSection?: FormattedSection
     ): any {
         if (this._globalState) {
-            globals = {...globals, globalState: this._globalState};
+            globals = addGlobalState(globals, this._globalState);
         }
         return this._styleExpression.evaluateWithoutErrorHandling(globals, feature, featureState, canonical, availableImages, formattedSection);
     }
@@ -210,7 +217,7 @@ export class ZoomConstantExpression<Kind extends EvaluationKind> {
         formattedSection?: FormattedSection
     ): any {
         if (this._globalState) {
-            globals = {...globals, globalState: this._globalState};
+            globals = addGlobalState(globals, this._globalState);
         }
         return this._styleExpression.evaluate(globals, feature, featureState, canonical, availableImages, formattedSection);
     }
@@ -244,7 +251,7 @@ export class ZoomDependentExpression<Kind extends EvaluationKind> {
         formattedSection?: FormattedSection
     ): any {
         if (this._globalState) {
-            globals = {...globals, globalState: this._globalState};
+            globals = addGlobalState(globals, this._globalState);
         }
         return this._styleExpression.evaluateWithoutErrorHandling(globals, feature, featureState, canonical, availableImages, formattedSection);
     }
@@ -258,7 +265,7 @@ export class ZoomDependentExpression<Kind extends EvaluationKind> {
         formattedSection?: FormattedSection
     ): any {
         if (this._globalState) {
-            globals = {...globals, globalState: this._globalState};
+            globals = addGlobalState(globals, this._globalState);
         }
         return this._styleExpression.evaluate(globals, feature, featureState, canonical, availableImages, formattedSection);
     }
@@ -551,3 +558,23 @@ function getDefaultValue(spec: StylePropertySpecification): Value {
             return (spec.default === undefined ? null : spec.default);
     }
 }
+
+function addGlobalState(globals: GlobalProperties, globalState: Record<string, any>): GlobalProperties {
+    const {
+        zoom,
+        heatmapDensity,
+        elevation,
+        lineProgress,
+        isSupportedScript,
+        accumulated
+    } = globals ?? {};
+    return {
+        zoom,
+        heatmapDensity,
+        elevation,
+        lineProgress,
+        isSupportedScript,
+        accumulated,
+        globalState
+    };
+}
diff --git a/src/reference/v8.json b/src/reference/v8.json
@@ -591,7 +591,7 @@
           "android": "https://github.com/maplibre/maplibre-native/issues/2783"
         }
       }
-    },   
+    },
     "baseShift": {
       "type": "number",
       "default": 0.0,
@@ -603,7 +603,7 @@
           "android": "https://github.com/maplibre/maplibre-native/issues/2783"
         }
       }
-    },    
+    },
     "volatile": {
       "type": "boolean",
       "default": false,
@@ -5697,7 +5697,7 @@
     "type": {
       "type": "projectionDefinition",
       "doc": "The projection definition type. Can be specified as a string, a transition state, or an expression.",
-      "default": "mercator",   
+      "default": "mercator",
       "property-type": "data-constant",
       "transition": false,
       "expression": {
@@ -6371,7 +6371,7 @@
     "line-dasharray": {
       "type": "array",
       "value": "number",
-      "doc": "Specifies the lengths of the alternating dashes and gaps that form the dash pattern. The lengths are later scaled by the line width. To convert a dash length to pixels, multiply the length by the current line width. Note that GeoJSON sources with `lineMetrics: true` specified won't render dashed lines to the expected scale. Also note that zoom-dependent expressions will be evaluated only at integer zoom levels.",
+      "doc": "Specifies the lengths of the alternating dashes and gaps that form the dash pattern. The lengths are later scaled by the line width. To convert a dash length to pixels, multiply the length by the current line width. GeoJSON sources with `lineMetrics: true` specified won't render dashed lines to the expected scale. Zoom-dependent expressions will be evaluated only at integer zoom levels. The only way to create an array value is using `[\"literal\", [...]]`; arrays cannot be read from or derived from feature properties.",
       "minimum": 0,
       "transition": true,
       "units": "line widths",
@@ -6395,10 +6395,11 @@
       "expression": {
         "interpolated": false,
         "parameters": [
-          "zoom"
+          "zoom",
+          "feature"
         ]
       },
-      "property-type": "cross-faded"
+      "property-type": "cross-faded-data-driven"
     },
     "line-pattern": {
       "type": "resolvedImage",
diff --git a/src/validate_style.min.ts b/src/validate_style.min.ts
@@ -75,10 +75,7 @@ validateStyleMin.layoutProperty = wrapCleanErrors(injectValidateSpec(validateLay
 
 function injectValidateSpec(validator: (options: object) => any) {
     return function(options) {
-        return validator({
-            ...options,
-            validateSpec: validate,
-        });
+        return validator(Object.assign({}, options, {validateSpec: validate}));
     };
 }
 
diff --git a/test/integration/style-spec/tests/functions.input.json b/test/integration/style-spec/tests/functions.input.json
@@ -934,15 +934,6 @@
         "fill-extrusion-opacity": ["get", "opacity"]
       }
     },
-    {
-      "id": "invalid expression - line-dasharray must use step interpolation",
-      "type": "line",
-      "source": "source",
-      "source-layer": "layer",
-      "paint": {
-        "line-dasharray": ["interpolate", ["linear"], ["zoom"], 0, ["literal", [1, 2]], 1, ["literal", [3, 4]]]
-      }
-    },
     {
       "id": "invalid expression - heatmap-color must be zoom constant",
       "type": "heatmap",
diff --git a/test/integration/style-spec/tests/functions.output.json b/test/integration/style-spec/tests/functions.output.json
@@ -28,7 +28,7 @@
     "line": 75
   },
   {
-    "message": "layers[6].paint.line-dasharray.stops[0][0]: number expected, string found",
+    "message": "layers[6].paint.line-dasharray.stops[0][0]: number expected, string found\nIf you intended to use a categorical function, specify `\"type\": \"categorical\"`.",
     "line": 89
   },
   {
@@ -184,39 +184,35 @@
     "line": 934
   },
   {
-    "message": "layers[52].paint.line-dasharray: Type array<number> is not interpolatable.",
+    "message": "layers[52].paint.heatmap-color: zoom expressions not supported",
     "line": 943
   },
   {
-    "message": "layers[53].paint.heatmap-color: zoom expressions not supported",
-    "line": 952
+    "message": "layers[53].paint.heatmap-color: zoom functions not supported",
+    "line": 951
   },
   {
-    "message": "layers[54].paint.heatmap-color: zoom functions not supported",
-    "line": 960
+    "message": "layers[54].layout.line-join: \"feature-state\" data expressions are not supported with layout properties.",
+    "line": 959
   },
   {
-    "message": "layers[55].layout.line-join: \"feature-state\" data expressions are not supported with layout properties.",
-    "line": 968
+    "message": "layers[55].paint.line-width.stops[0][1]: expressions are not allowed in function stops.",
+    "line": 972
   },
   {
-    "message": "layers[56].paint.line-width.stops[0][1]: expressions are not allowed in function stops.",
-    "line": 981
+    "message": "layers[56]: layer \"invalid expression - color-relief-color must be zoom constant\" requires a raster-dem source",
+    "line": 983
   },
   {
-    "message": "layers[57]: layer \"invalid expression - color-relief-color must be zoom constant\" requires a raster-dem source",
-    "line": 992
+    "message": "layers[56].paint.color-relief-color: zoom expressions not supported",
+    "line": 986
   },
   {
-    "message": "layers[57].paint.color-relief-color: zoom expressions not supported",
-    "line": 995
+    "message": "layers[57]: layer \"invalid expression - color-relief-color must not be a function\" requires a raster-dem source",
+    "line": 991
   },
   {
-    "message": "layers[58]: layer \"invalid expression - color-relief-color must not be a function\" requires a raster-dem source",
-    "line": 1000
-  },
-  {
-    "message": "layers[58].paint.color-relief-color: zoom functions not supported",
-    "line": 1003
+    "message": "layers[57].paint.color-relief-color: zoom functions not supported",
+    "line": 994
   }
 ]
