@mapbox/mapbox-gl-style-spec 14.14.0-beta.1 → 14.14.0

package/expression/definitions/distance.ts

@@ -142,12 +142,11 @@ function getLngLatPoint(coord: Point, canonical: CanonicalTileID) {
     return [lngFromMercatorX(x), latFromMercatorY(y)];
 }
 
-function getLngLatPoints(coordinates: Array<Point>, canonical: CanonicalTileID) {
-    const coords = [];
+function getLngLatPoints(coordinates: Array<Point>, canonical: CanonicalTileID): number[][] {
+    const coords: number[][] = [];
     for (let i = 0; i < coordinates.length; ++i) {
         coords.push(getLngLatPoint(coordinates[i], canonical));
     }
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return coords;
 }
 

package/expression/definitions/image.ts

@@ -14,7 +14,7 @@ export type IconsetParams = {id: string};
 export type ImageOptions = {
     params?: ImageParams;
     iconset?: IconsetParams;
-}
+};
 
 type SerializedImageOptions = {
     params?: Record<string, SerializedExpression>;

package/expression/definitions/index.ts

@@ -120,30 +120,16 @@ function hsla(ctx: EvaluationContext, [h, s, l, a]: Expression[]) {
     return color;
 }
 
-function has(
-    key: string,
-    obj: {
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        [key: string]: any;
-    },
-): boolean {
+function has<T extends object>(key: keyof T, obj: T): boolean {
     return key in obj;
 }
 
-function get(key: string, obj: {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    [key: string]: any;
-}) {
+function get<T extends object>(key: keyof T, obj: T): T[keyof T] | null {
     const v = obj[key];
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return typeof v === 'undefined' ? null : v;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function binarySearch(v: any, a: {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    [key: number]: any;
-}, i: number, j: number) {
+function binarySearch(v: unknown, a: Record<number, unknown>, i: number, j: number): boolean {
     while (i <= j) {
         const m = (i + j) >> 1;
         if (a[m] === v)
@@ -237,7 +223,6 @@ CompoundExpression.register(expressions, {
         overloads: [
             [
                 [StringType],
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-return
                 (ctx, [key]) => get(key.evaluate(ctx), ctx.properties())
             ], [
                 [StringType, ObjectType],
@@ -249,8 +234,7 @@ CompoundExpression.register(expressions, {
     'feature-state': [
         ValueType,
         [StringType],
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-        (ctx, [key]) => get(key.evaluate(ctx), ctx.featureState || {})
+        (ctx, [key]) => get(key.evaluate(ctx), ctx.featureState || {}) as Value
     ],
     'properties': [
         ObjectType,

package/expression/definitions/interpolate.ts

@@ -157,20 +157,17 @@ class Interpolate implements Expression {
         const outputs = this.outputs;
 
         if (labels.length === 1) {
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-            return outputs[0].evaluate(ctx);
+            return outputs[0].evaluate(ctx) as Color;
         }
 
-        const value = (this.input.evaluate(ctx) as number);
+        const value: number = this.input.evaluate(ctx);
         if (value <= labels[0]) {
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-            return outputs[0].evaluate(ctx);
+            return outputs[0].evaluate(ctx) as Color;
         }
 
         const stopCount = labels.length;
         if (value >= labels[stopCount - 1]) {
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-            return outputs[stopCount - 1].evaluate(ctx);
+            return outputs[stopCount - 1].evaluate(ctx) as Color;
         }
 
         const index = findStopLessThanOrEqualTo(labels, value);
@@ -178,8 +175,8 @@ class Interpolate implements Expression {
         const upper = labels[index + 1];
         const t = Interpolate.interpolationFactor(this.interpolation, value, lower, upper);
 
-        const outputLower = outputs[index].evaluate(ctx);
-        const outputUpper = outputs[index + 1].evaluate(ctx);
+        const outputLower: Color = outputs[index].evaluate(ctx);
+        const outputUpper: Color = outputs[index + 1].evaluate(ctx);
 
         if (this.operator === 'interpolate') {
             // eslint-disable-next-line @typescript-eslint/no-unsafe-return

package/expression/definitions/within.ts

@@ -2,11 +2,11 @@ import {isValue} from '../values';
 import {BooleanType} from '../types';
 import {updateBBox, boxWithinBox, pointWithinPolygon, segmentIntersectSegment} from '../../util/geometry_util';
 
+import type Point from '@mapbox/point-geometry';
 import type {Type} from '../types';
 import type {Expression, SerializedExpression} from '../expression';
 import type ParsingContext from '../parsing_context';
 import type EvaluationContext from '../evaluation_context';
-import type Point from '@mapbox/point-geometry';
 import type {CanonicalTileID} from '../../types/tile_id';
 import type {BBox} from '../../util/geometry_util';
 
@@ -74,10 +74,10 @@ function lineStringWithinPolygons(line: Array<GeoJSON.Position>, polygons: Array
     return false;
 }
 
-function getTilePolygon(coordinates: Array<Array<GeoJSON.Position>>, bbox: BBox, canonical: CanonicalTileID) {
-    const polygon = [];
+function getTilePolygon(coordinates: Array<Array<GeoJSON.Position>>, bbox: BBox, canonical: CanonicalTileID): Array<Array<number[]>> {
+    const polygon: Array<Array<number[]>> = [];
     for (let i = 0; i < coordinates.length; i++) {
-        const ring = [];
+        const ring: number[][] = [];
         for (let j = 0; j < coordinates[i].length; j++) {
             const coord = getTileCoordinates(coordinates[i][j], canonical);
             updateBBox(bbox, coord);
@@ -85,17 +85,17 @@ function getTilePolygon(coordinates: Array<Array<GeoJSON.Position>>, bbox: BBox,
         }
         polygon.push(ring);
     }
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+
     return polygon;
 }
 
-function getTilePolygons(coordinates: Array<Array<Array<GeoJSON.Position>>>, bbox: BBox, canonical: CanonicalTileID) {
-    const polygons = [];
+function getTilePolygons(coordinates: Array<Array<Array<GeoJSON.Position>>>, bbox: BBox, canonical: CanonicalTileID): Array<Array<Array<number[]>>> {
+    const polygons: Array<Array<Array<number[]>>> = [];
     for (let i = 0; i < coordinates.length; i++) {
         const polygon = getTilePolygon(coordinates[i], bbox, canonical);
         polygons.push(polygon);
     }
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+
     return polygons;
 }
 
@@ -116,11 +116,10 @@ function resetBBox(bbox: BBox) {
     bbox[2] = bbox[3] = -Infinity;
 }
 
-function getTilePoints(geometry: Array<Array<Point>> | null | undefined, pointBBox: BBox, polyBBox: Array<number>, canonical: CanonicalTileID) {
+function getTilePoints(geometry: Array<Array<Point>> | null | undefined, pointBBox: BBox, polyBBox: Array<number>, canonical: CanonicalTileID): Array<number[]> {
     const worldSize = Math.pow(2, canonical.z) * EXTENT;
     const shifts = [canonical.x * EXTENT, canonical.y * EXTENT];
-    const tilePoints = [];
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+    const tilePoints: Array<number[]> = [];
     if (!geometry) return tilePoints;
     for (const points of geometry) {
         for (const point of points) {
@@ -129,11 +128,11 @@ function getTilePoints(geometry: Array<Array<Point>> | null | undefined, pointBB
             tilePoints.push(p);
         }
     }
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+
     return tilePoints;
 }
 
-function getTileLines(geometry: Array<Array<Point>> | null | undefined, lineBBox: BBox, polyBBox: Array<number>, canonical: CanonicalTileID) {
+function getTileLines(geometry: Array<Array<Point>> | null | undefined, lineBBox: BBox, polyBBox: Array<number>, canonical: CanonicalTileID): Array<Array<GeoJSON.Position>> {
     const worldSize = Math.pow(2, canonical.z) * EXTENT;
     const shifts = [canonical.x * EXTENT, canonical.y * EXTENT];
     const tileLines: Array<Array<GeoJSON.Position>> = [];
@@ -158,7 +157,7 @@ function getTileLines(geometry: Array<Array<Point>> | null | undefined, lineBBox
     return tileLines;
 }
 
-function pointsWithinPolygons(ctx: EvaluationContext, polygonGeometry: GeoJSONPolygons) {
+function pointsWithinPolygons(ctx: EvaluationContext, polygonGeometry: GeoJSONPolygons): boolean {
     const pointBBox: BBox = [Infinity, Infinity, -Infinity, -Infinity];
     const polyBBox: BBox = [Infinity, Infinity, -Infinity, -Infinity];
 
@@ -189,7 +188,7 @@ function pointsWithinPolygons(ctx: EvaluationContext, polygonGeometry: GeoJSONPo
     return true;
 }
 
-function linesWithinPolygons(ctx: EvaluationContext, polygonGeometry: GeoJSONPolygons) {
+function linesWithinPolygons(ctx: EvaluationContext, polygonGeometry: GeoJSONPolygons): boolean {
     const lineBBox: BBox = [Infinity, Infinity, -Infinity, -Infinity];
     const polyBBox: BBox = [Infinity, Infinity, -Infinity, -Infinity];
 

package/expression/index.ts

@@ -355,8 +355,7 @@ export function createPropertyExpression(
 ): Result<StylePropertyExpression, Array<ParsingError>> {
     expression = createExpression(expression, propertySpec, scope, options);
     if (expression.result === 'error') {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-        return expression;
+        return expression as Result<StylePropertyExpression, Array<ParsingError>>;
     }
 
     const parsed = expression.value.expression;
@@ -476,7 +475,7 @@ export function normalizePropertyExpression<T>(
 // expression (collectively referred to as a "curve"). The curve may be wrapped in one or more "let" or
 // "coalesce" expressions.
 function findZoomCurve(expression: Expression): Step | Interpolate | ParsingError | null {
-    let result = null;
+    let result: Step | Interpolate | ParsingError | null = null;
     if (expression instanceof Let) {
         result = findZoomCurve(expression.result);
 
@@ -508,7 +507,6 @@ function findZoomCurve(expression: Expression): Step | Interpolate | ParsingErro
         }
     });
 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return result;
 }
 

package/expression/types/image_variant.ts

@@ -19,7 +19,7 @@ export type StringifiedImageVariant = Brand<string, 'ImageVariant'>;
 export type RasterizationOptions = {
     params?: Record<string, Color>;
     transform?: DOMMatrix;
-}
+};
 
 /**
  * `ImageVariant` is a component of {@link ResolvedImage}

package/expression/types.ts

@@ -34,8 +34,19 @@ export type ResolvedImageTypeT = {
 
 export type EvaluationKind = 'constant' | 'source' | 'camera' | 'composite';
 
-export type Type = NullTypeT | NumberTypeT | StringTypeT | BooleanTypeT | ColorTypeT | ObjectTypeT | ValueTypeT |
-ArrayType | ErrorTypeT | CollatorTypeT | FormattedTypeT | ResolvedImageTypeT;
+export type Type =
+    | NullTypeT
+    | NumberTypeT
+    | StringTypeT
+    | BooleanTypeT
+    | ColorTypeT
+    | ObjectTypeT
+    | ValueTypeT
+    | ArrayType
+    | ErrorTypeT
+    | CollatorTypeT
+    | FormattedTypeT
+    | ResolvedImageTypeT;
 
 export type ArrayType = {
     kind: 'array';

package/group_by_layout.ts

@@ -2,8 +2,7 @@ import refProperties from './util/ref_properties';
 
 import type {LayerSpecification} from './types';
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function stringify(obj: any) {
+function stringify(obj: unknown) {
     if (typeof obj === 'number' || typeof obj === 'boolean' || typeof obj === 'string' || obj === undefined || obj === null)
         return JSON.stringify(obj);
 
@@ -30,8 +29,7 @@ function getKey(layer: LayerSpecification) {
     return key;
 }
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-function containsKey(obj: any, key: string) {
+function containsKey(obj: unknown, key: string) {
     function recursiveSearch(item) {
         if (typeof item === 'string' && item === key) {
             return true;
@@ -106,12 +104,11 @@ export default function groupByLayout(
         group.push(layer);
     }
 
-    const result = [];
+    const result: LayerSpecification[][] = [];
 
     for (const k in groups) {
         result.push(groups[k]);
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return result;
 }

package/migrate.ts

@@ -1,9 +1,8 @@
-/* eslint-disable @typescript-eslint/ban-ts-comment */
-// @ts-nocheck
-
 import migrateToV8 from './migrate/v8';
 import migrateToExpressions from './migrate/expressions';
 
+import type {StyleSpecification} from './types';
+
 /**
  * Migrate a Mapbox GL Style to the latest version.
  *
@@ -17,7 +16,7 @@ import migrateToExpressions from './migrate/expressions';
  * var style = fs.readFileSync('./style.json', 'utf8');
  * fs.writeFileSync('./style.json', JSON.stringify(migrate(style)));
  */
-export default function (style) {
+export default function (style: {version: 7} | StyleSpecification): StyleSpecification {
     let migrated = false;
 
     if (style.version === 7) {
@@ -26,14 +25,13 @@ export default function (style) {
     }
 
     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}`);
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-    return style;
+    return style as StyleSpecification;
 }

package/package.json

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

package/read_style.ts

@@ -6,8 +6,7 @@ import type {StyleSpecification} from './types';
 export default function readStyle(style: string | Buffer | StyleSpecification): StyleSpecification {
     if (style instanceof String || typeof style === 'string' || ArrayBuffer.isView(style)) {
         try {
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-            return jsonlint.parse(style.toString());
+            return jsonlint.parse(style.toString()) as StyleSpecification;
         } catch (e) {
             throw new ParsingError(e);
         }

package/reference/v8.json

@@ -1553,6 +1553,27 @@
     "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."
+    }
+  },
+  "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."
     }
   },
   "layout": [
@@ -2789,6 +2810,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"
       ],
@@ -2932,6 +2954,7 @@
       "type": "resolvedImage",
       "doc": "Name of image in sprite to use for drawing an image background.",
       "tokens": true,
+      "appearance": true,
       "sdk-support": {
         "basic functionality": {
           "js": "0.10.0",
@@ -2959,6 +2982,7 @@
       "period": 360,
       "units": "degrees",
       "doc": "Rotates the icon clockwise.",
+      "appearance": true,
       "requires": [
         "icon-image"
       ],
@@ -3047,6 +3071,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"
       ],

package/style-spec.ts

@@ -5,7 +5,7 @@ export type ExpressionSpecification = {
     interpolated: boolean,
     parameters?: ExpressionParameters,
     relaxZoomRestriction?: boolean
-}
+};
 
 export type StylePropertySpecification = {
     type: 'number',