@mapbox/mapbox-gl-style-spec 14.28.0 → 14.29.0

package/feature_filter/index.ts

@@ -112,7 +112,7 @@ ${JSON.stringify(filterExp, null, 2)}
     }
 
     // Compile the static component of the filter
-    let filterFunc = null;
+    let filterFunc: PropertyDescriptor['value'] = null;
     let filterSpec = null;
     if (layerType !== 'background' && layerType !== 'sky' && layerType !== 'slot') {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
@@ -131,7 +131,7 @@ ${JSON.stringify(filterExp, null, 2)}
 
     // If the static component is not equal to the entire filter then we have a dynamic component
     // Compile the dynamic component separately
-    let dynamicFilterFunc = null;
+    let dynamicFilterFunc: PropertyDescriptor['value'] = null;
     let needFeature = null;
     if (staticFilter !== filterExp) {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
@@ -189,7 +189,7 @@ function collapseDynamicBooleanExpressions(expression: any): any {
         return collapsed;
     } else {
         // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-        return collapsed.map((subExpression) => collapseDynamicBooleanExpressions(subExpression));
+        return collapsed.map((subExpression: unknown) => collapseDynamicBooleanExpressions(subExpression));
     }
 }
 

package/function/convert.ts

@@ -19,7 +19,7 @@ export default function convertFunction<T>(parameters: FunctionSpecification<T>,
         return convertIdentityFunction(parameters, propertySpec);
     }
 
-    const zoomAndFeatureDependent = stops && typeof stops[0][0] === 'object';
+    const zoomAndFeatureDependent = stops && typeof stops[0]![0] === 'object';
     const featureDependent = zoomAndFeatureDependent || parameters.property !== undefined;
     const zoomDependent = zoomAndFeatureDependent || !featureDependent;
 
@@ -51,7 +51,7 @@ function convertIdentityFunction<T>(parameters: FunctionSpecification<T>, proper
         return [
             'match',
             get,
-            Object.keys(propertySpec.values),
+            Object.keys(propertySpec.values!),
             get,
             parameters.default
         ];
@@ -83,7 +83,7 @@ function convertZoomAndPropertyFunction<T>(
     const featureFunctionStops: Record<string, any> = {};
     const zoomStops = [];
     for (let s = 0; s < stops.length; s++) {
-        const stop = stops[s];
+        const stop = stops[s]!;
         const zoom = stop[0].zoom;
         if (featureFunctionParameters[zoom] === undefined) {
             featureFunctionParameters[zoom] = {
@@ -103,12 +103,12 @@ function convertZoomAndPropertyFunction<T>(
     // function is determined directly from the style property specification
     // for which it's being used: linear for interpolatable properties, step
     // otherwise.
-    const functionType = getFunctionType({} as FunctionSpecification<unknown>, propertySpec);
+    const functionType = getFunctionType({}, propertySpec);
     if (functionType === 'exponential') {
         const expression: ExpressionSpecification = [getInterpolateOperator(parameters), ['linear'], ['zoom']];
 
         for (const z of zoomStops) {
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
             const output = convertPropertyFunction(featureFunctionParameters[z], propertySpec, featureFunctionStops[z]);
             appendStopPair(expression, z, output, false);
         }
@@ -118,7 +118,7 @@ function convertZoomAndPropertyFunction<T>(
         const expression: ExpressionSpecification = ['step', ['zoom']];
 
         for (const z of zoomStops) {
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
             const output = convertPropertyFunction(featureFunctionParameters[z], propertySpec, featureFunctionStops[z]);
             appendStopPair(expression, z, output, true);
         }
@@ -156,7 +156,7 @@ function convertPropertyFunction<T>(
 ): ExpressionSpecification {
     const type = getFunctionType(parameters, propertySpec);
     const get: ExpressionSpecification = ['get', parameters.property];
-    if (type === 'categorical' && typeof stops[0][0] === 'boolean') {
+    if (type === 'categorical' && typeof stops[0]![0] === 'boolean') {
         assert(parameters.stops.length > 0 && parameters.stops.length <= 2);
         const expression: ExpressionSpecification = ['case'];
         for (const stop of stops) {
@@ -251,7 +251,7 @@ function appendStopPair(curve: ExpressionSpecification, input: unknown, output:
     curve.push(output);
 }
 
-function getFunctionType<T>(parameters: FunctionSpecification<T>, propertySpec: StylePropertySpecification): string {
+function getFunctionType(parameters: Pick<FunctionSpecification<unknown>, 'type'>, propertySpec: StylePropertySpecification): string {
     if (parameters.type) {
         return parameters.type;
     } else {

package/function/index.ts

@@ -11,6 +11,8 @@ import ResolvedImage from '../expression/types/resolved_image';
 import {supportsInterpolation} from '../util/properties';
 import {findStopLessThanOrEqualTo} from '../expression/stops';
 
+import type {FunctionSpecification} from '../types';
+
 export function isFunction(value) {
     return typeof value === 'object' && value !== null && !Array.isArray(value);
 }
@@ -24,7 +26,7 @@ export function createFunction(parameters, propertySpec) {
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
     const isColor = propertySpec.type === 'color';
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-    const zoomAndFeatureDependent = parameters.stops && typeof parameters.stops[0][0] === 'object';
+    const zoomAndFeatureDependent = (parameters.stops as FunctionSpecification<unknown>['stops'] | undefined) && typeof parameters.stops[0][0] === 'object';
     // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
     const featureDependent = zoomAndFeatureDependent || parameters.property !== undefined;
     const zoomDependent = zoomAndFeatureDependent || !featureDependent;
@@ -132,7 +134,7 @@ export function createFunction(parameters, propertySpec) {
             interpolationType,
 
             interpolationFactor: Interpolate.interpolationFactor.bind(undefined, interpolationType),
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-member-access
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
             zoomStops: featureFunctionStops.map(s => s[0]),
             evaluate({zoom}, properties) {
                 // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-call

package/group_by_layout.ts

@@ -2,6 +2,8 @@ import refProperties from './util/ref_properties';
 
 import type {LayerSpecification} from './types';
 
+type IndexableLayer = LayerSpecification & Record<string, unknown>;
+
 function stringify(obj: unknown) {
     if (typeof obj === 'number' || typeof obj === 'boolean' || typeof obj === 'string' || obj === undefined || obj === null)
         return JSON.stringify(obj);
@@ -15,13 +17,13 @@ function stringify(obj: unknown) {
     }
 
     let str = '{';
-    for (const key of Object.keys(obj as Record<string, unknown>).sort()) {
+    for (const key of Object.keys(obj).sort()) {
         str += `${key}:${stringify((obj as Record<string, unknown>)[key])},`;
     }
     return `${str}}`;
 }
 
-function getKey(layer: LayerSpecification) {
+function getKey(layer: IndexableLayer) {
     let key = '';
     for (const k of refProperties) {
         key += `/${stringify(layer[k])}`;
@@ -72,7 +74,7 @@ export default function groupByLayout(
     const groups = Object.create(null) as Record<string, LayerSpecification[]>;
 
     for (let i = 0; i < layers.length; i++) {
-        const layer = layers[i];
+        const layer = layers[i]!;
         let k = cachedKeys && cachedKeys[layer.id];
 
         if (!k) {
@@ -112,7 +114,7 @@ export default function groupByLayout(
     const result: LayerSpecification[][] = [];
 
     for (const k in groups) {
-        result.push(groups[k]);
+        result.push(groups[k]!);
     }
 
     return result;

package/package.json

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

package/read_style.ts

@@ -87,7 +87,7 @@ function parseTokens(s: string, tokens: number[]) {
         let lo = 0, hi = lineOffsets.length - 1;
         while (lo < hi) {
             const mid = (lo + hi + 1) >> 1;
-            if (lineOffsets[mid] <= pos) lo = mid;
+            if (lineOffsets[mid]! <= pos) lo = mid;
             else hi = mid - 1;
         }
         return lo + 1;
@@ -104,7 +104,7 @@ function parseTokens(s: string, tokens: number[]) {
         const end = tokens[i + 2];
         i += 3;
 
-        const line = lineNum(start);
+        const line = lineNum(start!);
 
         if (type === LBRACE) {
             const obj = setLine({}, line);

package/reference/v8.json

@@ -380,6 +380,16 @@
         },
         "color": {
           "doc": "The result will be coerced to a color."
+        },
+        "object": {
+          "doc": "The result will be coerced to an object.",
+          "sdk-support": {
+            "basic functionality": {
+              "js": "3.29.0",
+              "android": "11.29.0",
+              "ios": "11.29.0"
+            }
+          }
         }
       }
     },
@@ -3092,6 +3102,7 @@
       "experimental": true,
       "sdk-support": {
         "basic functionality": {
+          "js": "3.7.0",
           "android": "11.9.0",
           "ios": "11.9.0"
         }
@@ -5636,13 +5647,18 @@
         }
       },
       "distance": {
-        "doc": "Returns the shortest distance in meters between the evaluated feature and the input geometry. The input value can be a valid GeoJSON of type `Point`, `MultiPoint`, `LineString`, `MultiLineString`, `Polygon`, `MultiPolygon`, `Feature`, or `FeatureCollection`. Distance values returned may vary in precision due to loss in precision from encoding geometries, particularly below zoom level 13.",
+        "doc": "Returns the shortest distance in meters between the evaluated feature and the input geometry. The input value can be a valid GeoJSON of type `Point`, `MultiPoint`, `LineString`, `MultiLineString`, `Polygon`, `MultiPolygon`, `Feature`, or `FeatureCollection`, or expression that returns a valid GeoJSON. Distance values returned may vary in precision due to loss in precision from encoding geometries, particularly below zoom level 13.",
         "group": "Math",
         "sdk-support": {
           "basic functionality": {
             "js": "3.0.0",
             "android": "9.2.0",
             "ios": "5.9.0"
+          },
+          "expressions support": {
+            "js": "3.29.0",
+            "android": "11.29.0",
+            "ios": "11.29.0"
           }
         }
       },
@@ -9058,6 +9074,29 @@
         ]
       },
       "property-type": "data-constant"
+    },
+    "line-cutout-depth": {
+      "type": "number",
+      "default": 0,
+      "minimum": 0,
+      "units": "meters",
+      "doc": "Depth offset along the camera, in meters. When set to a non-zero value, applied cutout opacity is 0.",
+      "experimental": true,
+      "private": true,
+      "transition": true,
+      "sdk-support": {
+        "basic functionality": {
+          "android": "11.29.0",
+          "ios": "11.29.0"
+        }
+      },
+      "expression": {
+        "interpolated": true,
+        "parameters": [
+          "zoom"
+        ]
+      },
+      "property-type": "data-constant"
     }
   },
   "paint_circle": {
@@ -10251,7 +10290,6 @@
       "default": 0,
       "minimum": 0,
       "transition": true,
-      "experimental": true,
       "appearance": true,
       "sdk-support": {
         "basic functionality": {
@@ -10305,7 +10343,7 @@
     },
     "raster-color": {
       "type": "color",
-      "doc": "Defines a color map by which to colorize a raster layer, parameterized by the `[\"raster-value\"]` expression and evaluated at 256 uniformly spaced steps over the range specified by `raster-color-range`.",
+      "doc": "Defines the color ramp used to colorize a raster layer, parameterized by the `[\"raster-value\"]` expression and evaluated over the range specified by `raster-color-range`. Raster values are spaced evenly across the range by default.",
       "use-theme": true,
       "transition": false,
       "sdk-support": {
@@ -10345,7 +10383,7 @@
           "zoom"
         ]
       },
-      "doc": "When `raster-color` is active, specifies the combination of source RGB channels used to compute the raster value. Computed using the equation `mix.r * src.r + mix.g * src.g + mix.b * src.b + mix.a`. The first three components specify the mix of source red, green, and blue channels, respectively. The fourth component serves as a constant offset and is *not* multipled by source alpha. Source alpha is instead carried through and applied as opacity to the colorized result. Default value corresponds to RGB luminosity.",
+      "doc": "When `raster-color` is active, specifies how the raster value is computed from a non-`rasterarray` source's channels, using the equation `mix.r * src.r + mix.g * src.g + mix.b * src.b + mix.a`. The first three components weight the source's red, green, and blue channels; the fourth is a constant offset and is not multiplied by source alpha. Source alpha is carried through and applied as opacity to the colorized result. The default corresponds to RGB luminosity. `rasterarray` sources ignore this property, as their raster value is decoded directly from the source data.",
       "example": [
         0.2126,
         0.7152,
@@ -10375,7 +10413,7 @@
           "zoom"
         ]
       },
-      "doc": "When `raster-color` is active, specifies the range over which `raster-color` is tabulated. Units correspond to the computed raster value via `raster-color-mix`. For `rasterarray` sources, if `raster-color-range` is unspecified, the source's stated data range is used.",
+      "doc": "When `raster-color` is active, specifies the range of raster values mapped onto the color ramp, from the start of the ramp (low bound) to its end (high bound). For `rasterarray` sources the raster value is the decoded source data in the source's own units, and the source's stated data range is used when this property is unspecified. For other raster sources the raster value is computed from the source's channels via `raster-color-mix`. Defaults to `[0, 1]` when no range is otherwise available.",
       "example": [
         0.5,
         10
@@ -10388,6 +10426,34 @@
         }
       }
     },
+    "raster-color-scale": {
+      "type": "enum",
+      "doc": "When `raster-color` is active, specifies how raster values are distributed across the color ramp over the range specified by `raster-color-range`.",
+      "values": {
+        "linear": {
+          "doc": "Raster values are spaced evenly across the color ramp."
+        },
+        "log": {
+          "doc": "Raster values are spaced logarithmically, giving more of the color ramp to smaller values. Useful for data concentrated near the low end of a wide range."
+        }
+      },
+      "default": "linear",
+      "requires": [
+        "raster-color",
+        {"source": "raster-array"}
+      ],
+      "expression": {
+        "interpolated": false,
+        "parameters": []
+      },
+      "property-type": "data-constant",
+      "experimental": true,
+      "sdk-support": {
+        "basic functionality": {
+          "js": "3.29.0"
+        }
+      }
+    },
     "raster-hue-rotate": {
       "type": "number",
       "default": 0,
@@ -10641,6 +10707,21 @@
         "interpolated": false
       },
       "property-type": "data-constant"
+    },
+    "raster-allow-draping": {
+      "type": "boolean",
+      "default": true,
+      "experimental": true,
+      "doc": "Whether the raster layer is allowed to drape over terrain and globe. When disabled, the layer is rendered after all draped layers, which can change its position in the layer order. Disabling draping has a performance cost, since the terrain/globe geometry must be rendered again for each such layer.",
+      "transition": false,
+      "property-type": "data-constant",
+      "sdk-support": {
+        "basic functionality": {
+          "js": "3.28.0",
+          "android": "11.28.0",
+          "ios": "11.28.0"
+        }
+      }
     }
   },
   "paint_raster-particle": {

package/types/config_options.ts

@@ -7,7 +7,7 @@ export type ConfigOptionValue = {
     minValue?: number;
     maxValue?: number;
     stepValue?: number;
-    type?: 'string' | 'number' | 'boolean' | 'color';
+    type?: 'string' | 'number' | 'boolean' | 'color' | 'object';
 };
 
 export type ConfigOptions = Map<string, ConfigOptionValue>;

package/types.ts

@@ -366,7 +366,7 @@ export type SchemaSpecification = {
 
 export type OptionSpecification = {
     "default": unknown | ExpressionSpecification,
-    "type"?: "string" | "number" | "boolean" | "color",
+    "type"?: "string" | "number" | "boolean" | "color" | "object",
     "array"?: boolean,
     "minValue"?: number,
     "maxValue"?: number,
@@ -771,7 +771,12 @@ export type LineLayerSpecification = {
         /**
          * @experimental This property is experimental and subject to change in future versions.
          */
-        "line-blend-additive-clamp"?: PropertyValueSpecification<number>
+        "line-blend-additive-clamp"?: PropertyValueSpecification<number>,
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
+        "line-cutout-depth"?: PropertyValueSpecification<number>,
+        "line-cutout-depth-transition"?: TransitionSpecification
     },
     "appearances"?: Array<AppearanceSpecification>
 };
@@ -898,9 +903,6 @@ export type SymbolLayerSpecification = {
         "icon-color-contrast"?: number | ExpressionSpecification,
         "icon-color-brightness-min"?: number | ExpressionSpecification,
         "icon-color-brightness-max"?: number | ExpressionSpecification,
-        /**
-         * @experimental This property is experimental and subject to change in future versions.
-         */
         "symbol-z-offset"?: DataDrivenPropertyValueSpecification<number>,
         "symbol-z-offset-transition"?: TransitionSpecification
     },
@@ -1230,6 +1232,10 @@ export type RasterLayerSpecification = {
         "raster-color-mix-transition"?: TransitionSpecification,
         "raster-color-range"?: PropertyValueSpecification<[number, number]>,
         "raster-color-range-transition"?: TransitionSpecification,
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
+        "raster-color-scale"?: "linear" | "log" | ExpressionSpecification,
         "raster-hue-rotate"?: PropertyValueSpecification<number>,
         "raster-hue-rotate-transition"?: TransitionSpecification,
         "raster-brightness-min"?: PropertyValueSpecification<number>,
@@ -1256,7 +1262,11 @@ export type RasterLayerSpecification = {
         /**
          * @experimental This property is experimental and subject to change in future versions.
          */
-        "raster-elevation-reference"?: "sea" | "ground" | ExpressionSpecification
+        "raster-elevation-reference"?: "sea" | "ground" | ExpressionSpecification,
+        /**
+         * @experimental This property is experimental and subject to change in future versions.
+         */
+        "raster-allow-draping"?: boolean
     },
     "appearances"?: Array<AppearanceSpecification>
 };

package/util/properties.ts

@@ -3,7 +3,7 @@ import type {PropertyExpressionSpecification, StylePropertySpecification} from '
 export const TRANSITION_KEY_RE = /^(.*)-transition$/;
 export const USE_THEME_KEY_RE = /^(.*)-use-theme$/;
 
-type ExpressionParameter = PropertyExpressionSpecification['parameters'][number];
+type ExpressionParameter = NonNullable<PropertyExpressionSpecification['parameters']>[number];
 
 function expressionHasParameter(
     expression: PropertyExpressionSpecification | null | undefined,

package/validate/validate.ts

@@ -28,11 +28,21 @@ import validateIconset from './validate_iconset';
 import type ValidationError from '../error/validation_error';
 import type {StyleReference} from '../reference/latest';
 import type {StyleSpecification} from '../types';
-import type {FunctionValidatorOptions} from './validate_function';
 import type {StylePropertySpecification} from '../style-spec';
 import type {ExpressionValidatorOptions} from './validate_expression';
 
-const VALIDATORS: Record<string, (...args: unknown[]) => ValidationError[]> = {
+type Validator = {
+    // eslint-disable-next-line @typescript-eslint/method-signature-style
+    validate(options: {
+        key: string;
+        value: unknown;
+        valueSpec?: unknown;
+        style?: Partial<StyleSpecification>;
+        styleSpec?: StyleReference;
+    }): ValidationError[];
+}['validate'];
+
+const VALIDATORS: Record<string, Validator> = {
     '*': () => [],
     'array': validateArray,
     'boolean': validateBoolean,
@@ -99,16 +109,16 @@ export type ValidatorOptions = {
  */
 export default function validate(options: ValidatorOptions, arrayAsExpression: boolean = false): ValidationError[] {
     const value = options.value;
-    const valueSpec = options.valueSpec;
+    const valueSpec = options.valueSpec!;
     const styleSpec = options.styleSpec;
 
     if (valueSpec.expression) {
-        if (isFunction(unbundle(value))) return validateFunction(options as unknown as FunctionValidatorOptions);
+        if (isFunction(unbundle(value))) return validateFunction(options);
         if (isExpression(deepUnbundle(value))) return validateExpression(options as unknown as ExpressionValidatorOptions);
     }
 
     if (valueSpec.type && VALIDATORS[valueSpec.type]) {
-        const errors = VALIDATORS[valueSpec.type](options);
+        const errors = VALIDATORS[valueSpec.type]!(options);
         if (arrayAsExpression === true && errors.length > 0 && Array.isArray(options.value)) {
             // Try to validate as an expression
             return validateExpression(options as unknown as ExpressionValidatorOptions);

package/validate/validate_appearance.ts

@@ -29,7 +29,7 @@ export default function validateAppearance(options: AppearanceValidatorOptions):
     const errors = validateObject({
         key,
         value,
-        valueSpec: options.styleSpec.appearance as object,
+        valueSpec: options.styleSpec.appearance as Record<PropertyKey, unknown>,
         style: options.style,
         styleSpec: options.styleSpec,
         objectElementValidators: {
@@ -52,12 +52,12 @@ function validateProperties(options: AppearanceValidatorOptions): Array<Validati
 
     const paintProperties = styleSpec[`paint_${layerType}`] as Record<string, StylePropertySpecification> | undefined;
     const layoutProperties = styleSpec[`layout_${layerType}`] as Record<string, StylePropertySpecification> | undefined;
-    const properties = options.object[options.objectKey] as object;
+    const properties = (options.object as Record<string, unknown>)[options.objectKey!] as Record<string, unknown>;
 
     for (const propertyKey in properties) {
         const propertyType =
-            propertyKey in paintProperties ? 'paint' :
-            propertyKey in layoutProperties ? 'layout' :
+            propertyKey in paintProperties! ? 'paint' :
+            propertyKey in layoutProperties! ? 'layout' :
             undefined;
 
         if (!propertyType) {
@@ -72,8 +72,8 @@ function validateProperties(options: AppearanceValidatorOptions): Array<Validati
             objectKey: propertyKey,
             layer,
             layerType,
-            value: properties[propertyKey] as unknown,
-            valueSpec: (propertyType === 'paint' ? paintProperties[propertyKey] : layoutProperties[propertyKey]),
+            value: properties[propertyKey],
+            valueSpec: (propertyType === 'paint' ? paintProperties![propertyKey] : layoutProperties![propertyKey]),
         };
 
         errors.push(...validateProperty(propertyValidationOptions, propertyType));
@@ -91,7 +91,7 @@ function validateCondition(options: AppearanceValidatorOptions): Array<Validatio
     errors.push(...validateExpression({
         key: options.key,
         value: condition,
-        valueSpec: (latest['appearance'] as Record<string, unknown>)['condition'],
+        valueSpec: (latest['appearance'] as Record<string, Partial<StylePropertySpecification>>)['condition'],
         expressionContext: 'appearance'
     }));
 

package/validate/validate_array.ts

@@ -4,29 +4,29 @@ import ValidationError from '../error/validation_error';
 
 import type {StyleReference} from '../reference/latest';
 import type {StyleSpecification} from '../types';
-import type {ArrayPropertySpecification} from '../style-spec';
 
-type ArraySpec = {
+export type ArraySpec = {
     value?: unknown;
     values?: unknown[] | {[_: string]: unknown};
     length?: number;
     minimum?: number;
     maximum?: number;
     function?: unknown;
+    'min-length'?: number;
 };
 
 type ArrayElementSpec<T = unknown> = {
     type: string;
-    values: T[] | {[_: string]: unknown};
-    minimum: number;
-    maximum: number;
+    values?: T[] | {[_: string]: unknown};
+    minimum?: number;
+    maximum?: number;
     function: unknown;
 };
 
 type ArrayValidatorOptions<T = unknown> = {
     key: string;
     value: T;
-    valueSpec: ArrayPropertySpecification | ArraySpec;
+    valueSpec: ArraySpec;
     style: Partial<StyleSpecification>;
     styleSpec: StyleReference;
     arrayElementValidator: (...args: unknown[]) => ValidationError[];
@@ -61,7 +61,7 @@ export default function validateArray(options: ArrayValidatorOptions): Validatio
     };
 
     if (styleSpec.$version < 7) {
-        arrayElementSpec.function = (arraySpec as ArraySpec).function;
+        arrayElementSpec.function = arraySpec.function;
     }
 
     if (isObject(arraySpec.value)) {

package/validate/validate_enum.ts

@@ -17,12 +17,11 @@ export default function validateEnum(options: EnumValidatorOptions): ValidationE
     const errors: ValidationError[] = [];
     if (Array.isArray(valueSpec.values)) { // <=v7
         if (!valueSpec.values.includes(unbundle(value))) {
-            // eslint-disable-next-line @typescript-eslint/no-base-to-string
             errors.push(new ValidationError(key, value, `expected one of [${valueSpec.values.join(', ')}], ${JSON.stringify(value)} found`));
         }
     } else { // >=v8
-        if (!Object.keys(valueSpec.values).includes(unbundle(value) as string)) {
-            errors.push(new ValidationError(key, value, `expected one of [${Object.keys(valueSpec.values).join(', ')}], ${JSON.stringify(value)} found`));
+        if (!Object.keys(valueSpec.values!).includes(unbundle(value) as string)) {
+            errors.push(new ValidationError(key, value, `expected one of [${Object.keys(valueSpec.values!).join(', ')}], ${JSON.stringify(value)} found`));
         }
     }
 

package/validate/validate_fog.ts

@@ -34,7 +34,7 @@ export default function validateFog(options: FogValidatorOptions): ValidationErr
         const useThemeMatch = key.match(USE_THEME_KEY_RE);
 
         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-        if (useThemeMatch && fogSpec[useThemeMatch[1]]) {
+        if (useThemeMatch && fogSpec[useThemeMatch[1]!]) {
             errors = errors.concat(validate({
                 key,
                 value: fog[key],
@@ -43,7 +43,7 @@ export default function validateFog(options: FogValidatorOptions): ValidationErr
                 styleSpec
             }));
         // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
-        } else if (transitionMatch && fogSpec[transitionMatch[1]] && fogSpec[transitionMatch[1]].transition) {
+        } else if (transitionMatch && fogSpec[transitionMatch[1]!] && fogSpec[transitionMatch[1]!].transition) {
             errors = errors.concat(validate({
                 key,
                 value: fog[key],