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

package/types.ts

@@ -45,19 +45,19 @@ export type FunctionSpecification<T> = {
 };
 
 export type CameraFunctionSpecification<T> =
-    | { type: 'exponential', stops: Array<[number, T]> }
-    | { type: 'interval',    stops: Array<[number, T]> };
+    | {type: 'exponential', stops: Array<[number, T]>}
+    | {type: 'interval',    stops: Array<[number, T]>};
 
 export type SourceFunctionSpecification<T> =
-    | { type: 'exponential', stops: Array<[number, T]>, property: string, default?: T }
-    | { type: 'interval',    stops: Array<[number, T]>, property: string, default?: T }
-    | { type: 'categorical', stops: Array<[string | number | boolean, T]>, property: string, default?: T }
-    | { type: 'identity', property: string, default?: T };
+    | {type: 'exponential', stops: Array<[number, T]>, property: string, default?: T}
+    | {type: 'interval',    stops: Array<[number, T]>, property: string, default?: T}
+    | {type: 'categorical', stops: Array<[string | number | boolean, T]>, property: string, default?: T}
+    | {type: 'identity', property: string, default?: T};
 
 export type CompositeFunctionSpecification<T> =
-    | { type: 'exponential', stops: Array<[{zoom: number, value: number}, T]>, property: string, default?: T }
-    | { type: 'interval',    stops: Array<[{zoom: number, value: number}, T]>, property: string, default?: T }
-    | { type: 'categorical', stops: Array<[{zoom: number, value: string | number | boolean}, T]>, property: string, default?: T };
+    | {type: 'exponential', stops: Array<[{zoom: number, value: number}, T]>, property: string, default?: T}
+    | {type: 'interval',    stops: Array<[{zoom: number, value: number}, T]>, property: string, default?: T}
+    | {type: 'categorical', stops: Array<[{zoom: number, value: string | number | boolean}, T]>, property: string, default?: T};
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 export type ExpressionSpecification = [string, ...any[]];
@@ -120,19 +120,19 @@ export type StyleSpecification = {
      * @experimental This property is experimental and subject to change in future versions.
      */
     "featuresets"?: FeaturesetsSpecification
-}
+};
 
 export type SourcesSpecification = {
     [_: string]: SourceSpecification
-}
+};
 
 export type ModelsSpecification = {
     [_: string]: ModelSpecification
-}
+};
 
 export type IconsetsSpecification = {
     [_: string]: IconsetSpecification
-}
+};
 
 export type LightSpecification = {
     "anchor"?: PropertyValueSpecification<"map" | "viewport">,
@@ -143,13 +143,13 @@ export type LightSpecification = {
     "color-use-theme"?: PropertyValueSpecification<string>,
     "intensity"?: PropertyValueSpecification<number>,
     "intensity-transition"?: TransitionSpecification
-}
+};
 
 export type TerrainSpecification = {
     "source": string,
     "exaggeration"?: PropertyValueSpecification<number>,
     "exaggeration-transition"?: TransitionSpecification
-}
+};
 
 export type FogSpecification = {
     "range"?: PropertyValueSpecification<[number, number]>,
@@ -169,7 +169,7 @@ export type FogSpecification = {
     "star-intensity-transition"?: TransitionSpecification,
     "vertical-range"?: PropertyValueSpecification<[number, number]>,
     "vertical-range-transition"?: TransitionSpecification
-}
+};
 
 export type SnowSpecification = {
     /**
@@ -219,7 +219,7 @@ export type SnowSpecification = {
      */
     "flake-size"?: PropertyValueSpecification<number>,
     "flake-size-transition"?: TransitionSpecification
-}
+};
 
 export type RainSpecification = {
     /**
@@ -274,22 +274,22 @@ export type RainSpecification = {
      */
     "distortion-strength"?: PropertyValueSpecification<number>,
     "distortion-strength-transition"?: TransitionSpecification
-}
+};
 
 export type CameraSpecification = {
     "camera-projection"?: PropertyValueSpecification<"perspective" | "orthographic">,
     "camera-projection-transition"?: TransitionSpecification
-}
+};
 
 export type ColorThemeSpecification = {
     "data"?: ExpressionSpecification
-}
+};
 
 export type ProjectionSpecification = {
     "name": "albers" | "equalEarth" | "equirectangular" | "lambertConformalConic" | "mercator" | "naturalEarth" | "winkelTripel" | "globe",
     "center"?: [number, number],
     "parallels"?: [number, number]
-}
+};
 
 export type ImportSpecification = {
     "id": string,
@@ -297,7 +297,7 @@ export type ImportSpecification = {
     "config"?: ConfigSpecification,
     "data"?: StyleSpecification,
     "color-theme"?: ColorThemeSpecification | null | undefined
-}
+};
 
 export type IndoorSpecification = {
     /**
@@ -308,15 +308,15 @@ export type IndoorSpecification = {
      * @experimental This property is experimental and subject to change in future versions.
      */
     "buildingFeaturesetId"?: ExpressionSpecification
-}
+};
 
 export type ConfigSpecification = {
     [_: string]: unknown
-}
+};
 
 export type SchemaSpecification = {
     [_: string]: OptionSpecification
-}
+};
 
 export type OptionSpecification = {
     "default": ExpressionSpecification,
@@ -327,14 +327,14 @@ export type OptionSpecification = {
     "stepValue"?: number,
     "values"?: Array<unknown>,
     "metadata"?: unknown
-}
+};
 
 /**
  * @experimental This is experimental and subject to change in future versions.
  */
 export type FeaturesetsSpecification = {
     [_: string]: FeaturesetSpecification
-}
+};
 
 /**
  * @experimental This is experimental and subject to change in future versions.
@@ -348,7 +348,7 @@ export type FeaturesetSpecification = {
      * @experimental This property is experimental and subject to change in future versions.
      */
     "selectors"?: Array<SelectorSpecification>
-}
+};
 
 /**
  * @experimental This is experimental and subject to change in future versions.
@@ -370,7 +370,7 @@ export type SelectorSpecification = {
      * @experimental This property is experimental and subject to change in future versions.
      */
     "_uniqueFeatureID"?: boolean
-}
+};
 
 /**
  * @experimental This is experimental and subject to change in future versions.
@@ -380,7 +380,13 @@ export type SelectorPropertySpecification = {
      * @experimental This property is experimental and subject to change in future versions.
      */
     [_: string]: unknown
-}
+};
+
+export type AppearanceSpecification = {
+    "condition"?: ExpressionSpecification,
+    "name"?: string,
+    "properties"?: unknown
+};
 
 export type VectorSourceSpecification = {
     "type": "vector",
@@ -398,7 +404,7 @@ export type VectorSourceSpecification = {
     "promoteId"?: PromoteIdSpecification,
     "volatile"?: boolean,
     [_: string]: unknown
-}
+};
 
 export type RasterSourceSpecification = {
     "type": "raster",
@@ -416,7 +422,7 @@ export type RasterSourceSpecification = {
     "attribution"?: string,
     "volatile"?: boolean,
     [_: string]: unknown
-}
+};
 
 export type RasterDEMSourceSpecification = {
     "type": "raster-dem",
@@ -434,7 +440,7 @@ export type RasterDEMSourceSpecification = {
     "encoding"?: "terrarium" | "mapbox",
     "volatile"?: boolean,
     [_: string]: unknown
-}
+};
 
 /**
  * @experimental This is experimental and subject to change in future versions.
@@ -455,7 +461,7 @@ export type RasterArraySourceSpecification = {
     "rasterLayers"?: unknown,
     "volatile"?: boolean,
     [_: string]: unknown
-}
+};
 
 export type GeoJSONSourceSpecification = {
     "type": "geojson",
@@ -475,26 +481,26 @@ export type GeoJSONSourceSpecification = {
     "generateId"?: boolean,
     "promoteId"?: PromoteIdSpecification,
     "dynamic"?: boolean
-}
+};
 
 export type VideoSourceSpecification = {
     "type": "video",
     "urls": Array<string>,
     "coordinates": [[number, number], [number, number], [number, number], [number, number]]
-}
+};
 
 export type ImageSourceSpecification = {
     "type": "image",
     "url"?: string,
     "coordinates": [[number, number], [number, number], [number, number], [number, number]]
-}
+};
 
 export type ModelSourceSpecification = {
     "type": "model" | "batched-model",
     "maxzoom"?: number,
     "minzoom"?: number,
     "tiles"?: Array<string>
-}
+};
 
 export type SourceSpecification =
     | VectorSourceSpecification
@@ -504,7 +510,7 @@ export type SourceSpecification =
     | GeoJSONSourceSpecification
     | VideoSourceSpecification
     | ImageSourceSpecification
-    | ModelSourceSpecification
+    | ModelSourceSpecification;
 
 export type IconsetSpecification =
     | {
@@ -514,7 +520,7 @@ export type IconsetSpecification =
     | {
         "type": "source",
         "source": string
-    }
+    };
 
 export type ModelSpecification = string;
 
@@ -528,7 +534,7 @@ export type AmbientLightSpecification = {
         "intensity-transition"?: TransitionSpecification
     },
     "type": "ambient"
-}
+};
 
 export type DirectionalLightSpecification = {
     "id": string,
@@ -549,7 +555,7 @@ export type DirectionalLightSpecification = {
         "shadow-intensity-transition"?: TransitionSpecification
     },
     "type": "directional"
-}
+};
 
 export type FlatLightSpecification = {
     "id": string,
@@ -564,7 +570,7 @@ export type FlatLightSpecification = {
         "intensity-transition"?: TransitionSpecification
     },
     "type": "flat"
-}
+};
 
 export type LightsSpecification =
     | AmbientLightSpecification
@@ -627,8 +633,9 @@ export type FillLayerSpecification = {
         "fill-tunnel-structure-color"?: DataDrivenPropertyValueSpecification<ColorSpecification>,
         "fill-tunnel-structure-color-transition"?: TransitionSpecification,
         "fill-tunnel-structure-color-use-theme"?: PropertyValueSpecification<string>
-    }
-}
+    },
+    "appearances"?: Array<AppearanceSpecification>
+};
 
 /**
  * @deprecated Use `FillLayerSpecification['layout']` instead.
@@ -716,8 +723,9 @@ export type LineLayerSpecification = {
         "line-border-color-use-theme"?: PropertyValueSpecification<string>,
         "line-occlusion-opacity"?: PropertyValueSpecification<number>,
         "line-occlusion-opacity-transition"?: TransitionSpecification
-    }
-}
+    },
+    "appearances"?: Array<AppearanceSpecification>
+};
 
 /**
  * @deprecated Use `LineLayerSpecification['layout']` instead.
@@ -845,8 +853,9 @@ export type SymbolLayerSpecification = {
          */
         "symbol-z-offset"?: DataDrivenPropertyValueSpecification<number>,
         "symbol-z-offset-transition"?: TransitionSpecification
-    }
-}
+    },
+    "appearances"?: Array<AppearanceSpecification>
+};
 
 /**
  * @deprecated Use `SymbolLayerSpecification['layout']` instead.
@@ -900,8 +909,9 @@ export type CircleLayerSpecification = {
         "circle-stroke-opacity-transition"?: TransitionSpecification,
         "circle-emissive-strength"?: PropertyValueSpecification<number>,
         "circle-emissive-strength-transition"?: TransitionSpecification
-    }
-}
+    },
+    "appearances"?: Array<AppearanceSpecification>
+};
 
 /**
  * @deprecated Use `CircleLayerSpecification['layout']` instead.
@@ -936,8 +946,9 @@ export type HeatmapLayerSpecification = {
         "heatmap-color-use-theme"?: PropertyValueSpecification<string>,
         "heatmap-opacity"?: PropertyValueSpecification<number>,
         "heatmap-opacity-transition"?: TransitionSpecification
-    }
-}
+    },
+    "appearances"?: Array<AppearanceSpecification>
+};
 
 /**
  * @deprecated Use `HeatmapLayerSpecification['layout']` instead.
@@ -1053,8 +1064,9 @@ export type FillExtrusionLayerSpecification = {
         "fill-extrusion-line-width"?: DataDrivenPropertyValueSpecification<number>,
         "fill-extrusion-line-width-transition"?: TransitionSpecification,
         "fill-extrusion-cast-shadows"?: boolean
-    }
-}
+    },
+    "appearances"?: Array<AppearanceSpecification>
+};
 
 /**
  * @deprecated Use `FillExtrusionLayerSpecification['layout']` instead.
@@ -1154,8 +1166,9 @@ export type BuildingLayerSpecification = {
          */
         "building-facade-emissive-chance"?: PropertyValueSpecification<number>,
         "building-cutoff-fade-range"?: ExpressionSpecification
-    }
-}
+    },
+    "appearances"?: Array<AppearanceSpecification>
+};
 
 /**
  * @deprecated Use `BuildingLayerSpecification['layout']` instead.
@@ -1212,8 +1225,9 @@ export type RasterLayerSpecification = {
          */
         "raster-elevation"?: PropertyValueSpecification<number>,
         "raster-elevation-transition"?: TransitionSpecification
-    }
-}
+    },
+    "appearances"?: Array<AppearanceSpecification>
+};
 
 /**
  * @deprecated Use `RasterLayerSpecification['layout']` instead.
@@ -1251,8 +1265,9 @@ export type RasterParticleLayerSpecification = {
         "raster-particle-reset-rate-factor"?: number,
         "raster-particle-elevation"?: PropertyValueSpecification<number>,
         "raster-particle-elevation-transition"?: TransitionSpecification
-    }
-}
+    },
+    "appearances"?: Array<AppearanceSpecification>
+};
 
 /**
  * @deprecated Use `RasterParticleLayerSpecification['layout']` instead.
@@ -1293,8 +1308,9 @@ export type HillshadeLayerSpecification = {
         "hillshade-accent-color-use-theme"?: PropertyValueSpecification<string>,
         "hillshade-emissive-strength"?: PropertyValueSpecification<number>,
         "hillshade-emissive-strength-transition"?: TransitionSpecification
-    }
-}
+    },
+    "appearances"?: Array<AppearanceSpecification>
+};
 
 /**
  * @deprecated Use `HillshadeLayerSpecification['layout']` instead.
@@ -1347,8 +1363,9 @@ export type ModelLayerSpecification = {
         "model-height-based-emissive-strength-multiplier-transition"?: TransitionSpecification,
         "model-cutoff-fade-range"?: ExpressionSpecification,
         "model-front-cutoff"?: PropertyValueSpecification<[number, number, number]>
-    }
-}
+    },
+    "appearances"?: Array<AppearanceSpecification>
+};
 
 /**
  * @deprecated Use `ModelLayerSpecification['layout']` instead.
@@ -1386,8 +1403,9 @@ export type BackgroundLayerSpecification = {
         "background-opacity-transition"?: TransitionSpecification,
         "background-emissive-strength"?: PropertyValueSpecification<number>,
         "background-emissive-strength-transition"?: TransitionSpecification
-    }
-}
+    },
+    "appearances"?: Array<AppearanceSpecification>
+};
 
 /**
  * @deprecated Use `BackgroundLayerSpecification['layout']` instead.
@@ -1426,8 +1444,9 @@ export type SkyLayerSpecification = {
         "sky-atmosphere-color-use-theme"?: PropertyValueSpecification<string>,
         "sky-opacity"?: PropertyValueSpecification<number>,
         "sky-opacity-transition"?: TransitionSpecification
-    }
-}
+    },
+    "appearances"?: Array<AppearanceSpecification>
+};
 
 /**
  * @deprecated Use `SkyLayerSpecification['layout']` instead.
@@ -1449,9 +1468,10 @@ export type SlotLayerSpecification = {
     "minzoom"?: never,
     "maxzoom"?: never,
     "filter"?: never,
+    "appearances"?: Array<AppearanceSpecification>,
     "layout"?: never,
     "paint"?: never
-}
+};
 
 export type ClipLayerSpecification = {
     "id": string,
@@ -1467,8 +1487,9 @@ export type ClipLayerSpecification = {
         "clip-layer-types"?: ExpressionSpecification,
         "clip-layer-scope"?: ExpressionSpecification
     },
+    "appearances"?: Array<AppearanceSpecification>,
     "paint"?: never
-}
+};
 
 /**
  * @deprecated Use `ClipLayerSpecification['layout']` instead.

package/util/geometry_util.ts

@@ -31,7 +31,7 @@ export function classifyRings(rings: Array<Ring>, maxRings: number): Array<Array
 
     if (len <= 1) return [rings];
 
-    const polygons = [];
+    const polygons: Array<Array<Ring>> = [];
     let polygon,
         ccw;
 
@@ -63,7 +63,6 @@ export function classifyRings(rings: Array<Ring>, maxRings: number): Array<Array
         }
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return polygons;
 }
 

package/validate/validate.ts

@@ -30,10 +30,8 @@ import type {StyleReference} from '../reference/latest';
 import type {StyleSpecification} from '../types';
 import type ValidationError from '../error/validation_error';
 
-const VALIDATORS = {
-    '*'() {
-        return [];
-    },
+const VALIDATORS: Record<string, (unknown) => ValidationError[]> = {
+    '*': () => [],
     'array': validateArray,
     'boolean': validateBoolean,
     'number': validateNumber,
@@ -79,6 +77,9 @@ export type ValidationOptions = {
     objectKey?: string;
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     objectElementValidators?: Record<string, (...args: any[]) => Array<ValidationError>>;
+    propertyKey?: string
+    propertyType?: string
+    expressionContext?: 'property';
 };
 
 export default function validate(options: ValidationOptions, arrayAsExpression: boolean = false): Array<ValidationError> {
@@ -87,7 +88,6 @@ export default function validate(options: ValidationOptions, arrayAsExpression:
     const styleSpec = options.styleSpec;
 
     if (valueSpec.expression && isFunction(unbundle(value))) {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return validateFunction(options);
     } else if (valueSpec.expression && isExpression(deepUnbundle(value))) {
         return validateExpression(options);
@@ -97,7 +97,6 @@ export default function validate(options: ValidationOptions, arrayAsExpression:
             // Try to validate as an expression
             return validateExpression(options);
         } else {
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
             return valid;
         }
     } else {

package/validate/validate_array.ts

@@ -45,7 +45,7 @@ export default function validateArray(options: Options): Array<ValidationError>
         arrayElementSpec = arraySpec.value;
     }
 
-    let errors = [];
+    let errors: ValidationError[] = [];
     for (let i = 0; i < array.length; i++) {
         errors = errors.concat(validateArrayElement({
             array,
@@ -57,6 +57,6 @@ export default function validateArray(options: Options): Array<ValidationError>
             key: `${key}[${i}]`
         }, true));
     }
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+
     return errors;
 }

package/validate/validate_enum.ts

@@ -7,7 +7,7 @@ export default function validateEnum(options: ValidationOptions): Array<Validati
     const key = options.key;
     const value = options.value;
     const valueSpec = options.valueSpec;
-    const errors = [];
+    const errors: ValidationError[] = [];
 
     if (Array.isArray(valueSpec.values)) { // <=v7
         if (valueSpec.values.indexOf(unbundle(value)) === -1) {
@@ -18,6 +18,6 @@ export default function validateEnum(options: ValidationOptions): Array<Validati
             errors.push(new ValidationError(key, value, `expected one of [${Object.keys(valueSpec.values).join(', ')}], ${JSON.stringify(value)} found`));
         }
     }
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+
     return errors;
 }

package/validate/validate_expression.ts

@@ -62,7 +62,7 @@ export function disallowedFilterParameters(e: Expression, options: any): Array<V
     if (disallowedParameters.size === 0) {
         return [];
     }
-    const errors = [];
+    const errors: ValidationError[] = [];
 
     if (e instanceof CompoundExpression) {
         if (disallowedParameters.has(e.name)) {
@@ -73,6 +73,5 @@ export function disallowedFilterParameters(e: Expression, options: any): Array<V
         errors.push(...disallowedFilterParameters(arg, options));
     });
 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return errors;
 }

package/validate/validate_filter.ts

@@ -26,12 +26,11 @@ export default function validateFilter(options: Options): Array<ValidationError>
             valueSpec: options.styleSpec[`filter_${layerType}`]
         }));
     } else {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return validateNonExpressionFilter(options);
     }
 }
 
-function validateNonExpressionFilter(options: Options) {
+function validateNonExpressionFilter(options: Options): ValidationError[] {
     const value = options.value;
     const key = options.key;
 
@@ -42,7 +41,7 @@ function validateNonExpressionFilter(options: Options) {
     const styleSpec = options.styleSpec;
     let type;
 
-    let errors = [];
+    let errors: ValidationError[] = [];
 
     if (value.length < 1) {
         return [new ValidationError(key, value, 'filter array must have at least 1 element')];
@@ -120,6 +119,6 @@ function validateNonExpressionFilter(options: Options) {
         }
         break;
     }
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+
     return errors;
 }

package/validate/validate_fog.ts

@@ -4,20 +4,18 @@ import getType from '../util/get_type';
 
 import type {ValidationOptions} from './validate';
 
-export default function validateFog(options: ValidationOptions): Array<ValidationError> {
+export default function validateFog(options: ValidationOptions): ValidationError[] {
     const fog = options.value;
     const style = options.style;
     const styleSpec = options.styleSpec;
     const fogSpec = styleSpec.fog;
-    let errors = [];
+    let errors: ValidationError[] = [];
 
     const rootType = getType(fog);
     if (fog === undefined) {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return errors;
     } else if (rootType !== 'object') {
         errors = errors.concat([new ValidationError('fog', fog, `object expected, ${rootType} found`)]);
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return errors;
     }
 
@@ -54,6 +52,5 @@ export default function validateFog(options: ValidationOptions): Array<Validatio
         }
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return errors;
 }