@mapbox/mapbox-gl-style-spec 14.15.0-beta.2 → 14.16.0-beta.1

package/validate/validate_expression.ts

@@ -4,10 +4,10 @@ import {deepUnbundle} from '../util/unbundle_jsonlint';
 import {isStateConstant, isGlobalPropertyConstant, isFeatureConstant} from '../expression/is_constant';
 import CompoundExpression from '../expression/compound_expression';
 
+import type {StylePropertySpecification} from '../../style-spec/style-spec';
 import type {Expression} from '../expression/expression';
 import type {StyleReference} from '../reference/latest';
 import type {StyleSpecification} from '../types';
-import type {StylePropertySpecification} from '../style-spec';
 
 export type ExpressionValidatorOptions = {
     key: string;
@@ -17,7 +17,7 @@ export type ExpressionValidatorOptions = {
     propertyType?: 'layout' | 'paint' | 'filter';
     style?: Partial<StyleSpecification>;
     styleSpec?: StyleReference;
-    expressionContext?: 'property' | 'filter' | 'cluster-initial' | 'cluster-reduce' | 'cluster-map';
+    expressionContext?: 'property' | 'filter' | 'cluster-initial' | 'cluster-reduce' | 'cluster-map' | 'appearance';
 };
 
 export default function validateExpression(options: ExpressionValidatorOptions): ValidationError[] {
@@ -28,27 +28,37 @@ export default function validateExpression(options: ExpressionValidatorOptions):
         });
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
     const expressionObj = (expression.value as any).expression || (expression.value as any)._styleExpression.expression;
 
     if (options.expressionContext === 'property' && (options.propertyKey === 'text-font') &&
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
         !expressionObj.outputDefined()) {
         return [new ValidationError(options.key, options.value, `Invalid data expression for "${options.propertyKey}". Output values must be contained as literals within the expression.`)];
     }
 
     if (options.expressionContext === 'property' && options.propertyType === 'layout' &&
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         (!isStateConstant(expressionObj))) {
         return [new ValidationError(options.key, options.value, '"feature-state" data expressions are not supported with layout properties.')];
     }
 
     if (options.expressionContext === 'filter') {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         return disallowedFilterParameters(expressionObj, options);
     }
 
+    if (options.expressionContext === 'appearance') {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+        return checkDisallowedParameters(expressionObj, options);
+    }
+
     if (options.expressionContext && options.expressionContext.indexOf('cluster') === 0) {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         if (!isGlobalPropertyConstant(expressionObj, ['zoom', 'feature-state'])) {
             return [new ValidationError(options.key, options.value, '"zoom" and "feature-state" expressions are not supported with cluster properties.')];
         }
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         if (options.expressionContext === 'cluster-initial' && !isFeatureConstant(expressionObj)) {
             return [new ValidationError(options.key, options.value, 'Feature data expressions are not supported with initial expression part of cluster properties.')];
         }
@@ -66,8 +76,11 @@ export function disallowedFilterParameters(e: Expression, options: any): Validat
         'distance-from-center'
     ]);
 
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
     if (options.valueSpec && options.valueSpec.expression) {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         for (const param of options.valueSpec.expression.parameters) {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
             disallowedParameters.delete(param);
         }
     }
@@ -79,6 +92,7 @@ export function disallowedFilterParameters(e: Expression, options: any): Validat
 
     if (e instanceof CompoundExpression) {
         if (disallowedParameters.has(e.name)) {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
             return [new ValidationError(options.key, options.value, `["${e.name}"] expression is not supported in a filter for a ${options.object.type} layer with id: ${options.object.id}`)];
         }
     }
@@ -88,3 +102,34 @@ export function disallowedFilterParameters(e: Expression, options: any): Validat
 
     return errors;
 }
+
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function checkDisallowedParameters(e: Expression, options: any): ValidationError[] {
+    const allowedParameters = new Set<string>();
+
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+    if (options.valueSpec && options.valueSpec.expression) {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+        for (const param of options.valueSpec.expression.parameters) {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
+            allowedParameters.add(param);
+        }
+    }
+
+    if (allowedParameters.size === 0) {
+        return [];
+    }
+    const errors: ValidationError[] = [];
+
+    if (e instanceof CompoundExpression) {
+        if (!allowedParameters.has(e.name)) {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
+            return [new ValidationError(options.key, options.value, `["${e.name}"] is not an allowed parameter`)];
+        }
+    }
+    e.eachChild((arg) => {
+        errors.push(...checkDisallowedParameters(arg, options));
+    });
+
+    return errors;
+}

package/validate/validate_filter.ts

@@ -3,7 +3,6 @@ import validateExpression from './validate_expression';
 import validateEnum from './validate_enum';
 import {getType, isString, isNumber, isBoolean} from '../util/get_type';
 import {unbundle, deepUnbundle} from '../util/unbundle_jsonlint';
-import extend from '../util/extend';
 import {isExpressionFilter} from '../feature_filter/index';
 
 import type {StyleReference} from '../reference/latest';
@@ -26,8 +25,9 @@ export default function validateFilter(options: FilterValidatorOptions): Validat
         // We default to a layerType of `fill` because that points to a non-dynamic filter definition within the style-spec.
         const layerType = options.layerType || 'fill';
 
-        return validateExpression(extend({}, options, {
-            expressionContext: 'filter',
+        return validateExpression(Object.assign({}, options, {
+            expressionContext: 'filter' as const,
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
             valueSpec: options.styleSpec[`filter_${layerType}`]
         }));
     } else {
@@ -51,6 +51,7 @@ function validateNonExpressionFilter(options: FilterValidatorOptions): Validatio
     let errors: ValidationError[] = validateEnum({
         key: `${key}[0]`,
         value: value[0],
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         valueSpec: styleSpec.filter_operator
     });
 
@@ -83,6 +84,7 @@ function validateNonExpressionFilter(options: FilterValidatorOptions): Validatio
                 errors = errors.concat(validateEnum({
                     key: `${key}[${i}]`,
                     value: value[i],
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
                     valueSpec: styleSpec.geometry_type
                 }));
             } else if (!isString(value[i]) && !isNumber(value[i]) && !isBoolean(value[i])) {

package/validate/validate_fog.ts

@@ -16,6 +16,7 @@ export default function validateFog(options: FogValidatorOptions): ValidationErr
     const fog = options.value;
     const style = options.style;
     const styleSpec = options.styleSpec;
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const fogSpec = styleSpec.fog;
 
     if (fog === undefined) {
@@ -31,6 +32,7 @@ export default function validateFog(options: FogValidatorOptions): ValidationErr
         const transitionMatch = key.match(/^(.*)-transition$/);
         const useThemeMatch = key.match(/^(.*)-use-theme$/);
 
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         if (useThemeMatch && fogSpec[useThemeMatch[1]]) {
             errors = errors.concat(validate({
                 key,
@@ -39,18 +41,22 @@ export default function validateFog(options: FogValidatorOptions): ValidationErr
                 style,
                 styleSpec
             }));
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         } else if (transitionMatch && fogSpec[transitionMatch[1]] && fogSpec[transitionMatch[1]].transition) {
             errors = errors.concat(validate({
                 key,
                 value: fog[key],
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
                 valueSpec: styleSpec.transition,
                 style,
                 styleSpec
             }));
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         } else if (fogSpec[key]) {
             errors = errors.concat(validate({
                 key,
                 value: fog[key],
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
                 valueSpec: fogSpec[key],
                 style,
                 styleSpec

package/validate/validate_function.ts

@@ -17,6 +17,7 @@ import type {StyleSpecification} from '../types';
 import type {StylePropertySpecification} from '../style-spec';
 
 function hasObjectStops(value: object): value is {stops: Array<Record<PropertyKey, unknown>>} {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const stops = value['stops'];
     return Array.isArray(stops) && Array.isArray(stops[0]) && isObject(stops[0][0]);
 }
@@ -51,6 +52,7 @@ export default function validateFunction(options: FunctionValidatorOptions): Val
     const errors = validateObject({
         key: options.key,
         value: options.value,
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         valueSpec: options.styleSpec.function,
         style: options.style,
         styleSpec: options.styleSpec,

package/validate/validate_iconset.ts

@@ -38,6 +38,7 @@ export default function validateIconset(options: IconsetValidatorOptions): Valid
     errors = errors.concat(validateObject({
         key,
         value: iconset,
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         valueSpec: styleSpec[`iconset_${type}`],
         style,
         styleSpec

package/validate/validate_import.ts

@@ -1,4 +1,3 @@
-import extend from '../util/extend';
 import validateStyle from './validate_style';
 import validateObject from './validate_object';
 import ValidationError from '../error/validation_error';
@@ -31,8 +30,9 @@ export default function validateImport(options: ImportValidatorOptions): Validat
         enumerable: false
     });
 
-    let errors = validateObject(extend({}, options, {
+    let errors = validateObject(Object.assign({}, options, {
         value: importSpec,
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         valueSpec: styleSpec.import
     }));
 

package/validate/validate_layer.ts

@@ -1,11 +1,12 @@
 import ValidationError from '../error/validation_error';
 import {unbundle} from '../util/unbundle_jsonlint';
+import validateArray from './validate_array';
 import validateObject from './validate_object';
 import validateFilter from './validate_filter';
+import validateAppearance, {type AppearanceValidatorOptions} from './validate_appearance';
 import validatePaintProperty from './validate_paint_property';
 import validateLayoutProperty from './validate_layout_property';
 import validateSpec from './validate';
-import extend from '../util/extend';
 import {isObject, isString} from '../util/get_type';
 
 import type {StyleReference} from '../reference/latest';
@@ -64,9 +65,11 @@ export default function validateLayer(options: LayerValidatorOptions): Validatio
         if (!parent) {
             if (typeof ref === 'string')
                 errors.push(new ValidationError(key, layer.ref, `ref layer "${ref}" not found`));
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         } else if (parent.ref) {
             errors.push(new ValidationError(key, layer.ref, 'ref cannot reference another ref layer'));
         } else {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
             type = unbundle(parent.type) as string;
         }
     } else if (!(type === 'background' || type === 'sky' || type === 'slot')) {
@@ -101,6 +104,7 @@ export default function validateLayer(options: LayerValidatorOptions): Validatio
     errors = errors.concat(validateObject({
         key,
         value: layer,
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         valueSpec: styleSpec.layer,
         style: options.style,
         styleSpec: options.styleSpec,
@@ -114,6 +118,7 @@ export default function validateLayer(options: LayerValidatorOptions): Validatio
                 return validateSpec({
                     key: `${key}.type`,
                     value: layer.type,
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
                     valueSpec: styleSpec.layer.type,
                     style: options.style,
                     styleSpec: options.styleSpec,
@@ -122,7 +127,7 @@ export default function validateLayer(options: LayerValidatorOptions): Validatio
                 });
             },
             filter(options) {
-                return validateFilter(extend({layerType: type}, options));
+                return validateFilter(Object.assign({layerType: type}, options));
             },
             layout(options) {
                 return validateObject({
@@ -134,7 +139,7 @@ export default function validateLayer(options: LayerValidatorOptions): Validatio
                     styleSpec: options.styleSpec,
                     objectElementValidators: {
                         '*'(options) {
-                            return validateLayoutProperty(extend({layerType: type}, options));
+                            return validateLayoutProperty(Object.assign({layerType: type}, options));
                         }
                     }
                 });
@@ -149,10 +154,38 @@ export default function validateLayer(options: LayerValidatorOptions): Validatio
                     styleSpec: options.styleSpec,
                     objectElementValidators: {
                         '*'(options) {
-                            return validatePaintProperty(extend({layerType: type, layer}, options));
+                            return validatePaintProperty(Object.assign({layerType: type, layer}, options));
                         }
                     }
                 });
+            },
+            appearances(options) {
+                const validationErrors = validateArray({
+                    key: options.key,
+                    value: options.value,
+
+                    valueSpec: options.valueSpec,
+                    style: options.style,
+                    styleSpec: options.styleSpec,
+                    arrayElementValidator: (options) => validateAppearance(Object.assign({layerType: type, layer}, options) as AppearanceValidatorOptions)
+                });
+                // Check non-repeated names on a given layer
+                const appearances = Array.isArray(options.value) ? options.value : [];
+                const dedupedNames = new Set<string>();
+                appearances.forEach((a, index) => {
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+                    const name: string | undefined = unbundle(a.name) as string | undefined;
+                    if (name) {
+                        if (dedupedNames.has(name)) {
+                            const layerId = unbundle((layer as LayerSpecification).id) as string;
+                            validationErrors.push(new ValidationError(options.key, name, `Duplicated appearance name "${name}" for layer "${layerId}"`));
+                        } else {
+                            dedupedNames.add(name);
+                        }
+                    }
+                });
+
+                return validationErrors;
             }
         }
     }));

package/validate/validate_light.ts

@@ -15,6 +15,7 @@ type LightValidatorOptions = {
 export default function validateLight(options: LightValidatorOptions): ValidationError[] {
     const light = options.value;
     const styleSpec = options.styleSpec;
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const lightSpec = styleSpec.light;
     const style = options.style;
 
@@ -31,6 +32,7 @@ export default function validateLight(options: LightValidatorOptions): Validatio
         const transitionMatch = key.match(/^(.*)-transition$/);
         const useThemeMatch = key.match(/^(.*)-use-theme$/);
 
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         if (useThemeMatch && lightSpec[useThemeMatch[1]]) {
             errors = errors.concat(validate({
                 key,
@@ -39,18 +41,22 @@ export default function validateLight(options: LightValidatorOptions): Validatio
                 style,
                 styleSpec
             }));
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         } else if (transitionMatch && lightSpec[transitionMatch[1]] && lightSpec[transitionMatch[1]].transition) {
             errors = errors.concat(validate({
                 key,
                 value: light[key],
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
                 valueSpec: styleSpec.transition,
                 style,
                 styleSpec
             }));
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         } else if (lightSpec[key]) {
             errors = errors.concat(validate({
                 key,
                 value: light[key],
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
                 valueSpec: lightSpec[key],
                 style,
                 styleSpec

package/validate/validate_lights.ts

@@ -28,6 +28,7 @@ export default function validateLights(options: LightsValidatorOptions): Validat
 
     let errors: ValidationError[] = [];
     const styleSpec = options.styleSpec;
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const lightSpec = styleSpec['light-3d'];
     const style = options.style;
     const lights = options.style.lights;
@@ -60,6 +61,7 @@ export default function validateLights(options: LightsValidatorOptions): Validat
         return errors;
     }
 
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const lightPropertySpec = styleSpec[lightType];
 
     for (const key in light) {
@@ -73,6 +75,7 @@ export default function validateLights(options: LightsValidatorOptions): Validat
                 const transitionMatch = propertyKey.match(/^(.*)-transition$/);
                 const useThemeMatch = propertyKey.match(/^(.*)-use-theme$/);
 
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
                 if (useThemeMatch && lightPropertySpec[useThemeMatch[1]]) {
                     errors = errors.concat(validate({
                         key,
@@ -81,20 +84,24 @@ export default function validateLights(options: LightsValidatorOptions): Validat
                         style,
                         styleSpec
                     }));
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
                 } else if (transitionMatch && lightPropertySpec[transitionMatch[1]] && lightPropertySpec[transitionMatch[1]].transition) {
                     errors = errors.concat(validate({
                         key,
                         value: light[key],
+                        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
                         valueSpec: styleSpec.transition,
                         style,
                         styleSpec
                     }));
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
                 } else if (!lightPropertySpec[propertyKey]) {
                     errors = errors.concat([new ValidationWarning(options.key, properties[propertyKey], `unknown property "${propertyKey}"`)]);
                 } else {
                     errors = errors.concat(validate({
                         key: propertyKey,
                         value: properties[propertyKey],
+                        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
                         valueSpec: lightPropertySpec[propertyKey],
                         style,
                         styleSpec
@@ -102,10 +109,12 @@ export default function validateLights(options: LightsValidatorOptions): Validat
                 }
             }
         } else {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
             if (lightSpec[key]) {
                 errors = errors.concat(validate({
                     key,
                     value: light[key],
+                    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
                     valueSpec: lightSpec[key],
                     style,
                     styleSpec

package/validate/validate_model.ts

@@ -10,8 +10,7 @@ export function isValidUrl(str: string, allowRelativeUrls: boolean): boolean {
     try {
         new URL(str, isRelative && allowRelativeUrls ? 'http://example.com' : undefined);
         return true;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    } catch (_: any) {
+    } catch (_: unknown) {
         return false;
     }
 }

package/validate/validate_number.ts

@@ -3,14 +3,12 @@ import ValidationError from '../error/validation_error';
 
 import type {StyleReference} from '../reference/latest';
 import type {StyleSpecification} from '../types';
+import type {NumberPropertySpecification} from '../style-spec';
 
 type NumberValidatorOptions = {
     key: string;
     value: unknown;
-    valueSpec: {
-        minimum?: number;
-        maximum?: number
-    };
+    valueSpec: NumberPropertySpecification;
     style: Partial<StyleSpecification>;
     styleSpec: StyleReference;
     arrayIndex: number;
@@ -34,6 +32,7 @@ export default function validateNumber(options: NumberValidatorOptions): Validat
         let specMin = valueSpec.minimum;
         if (Array.isArray(valueSpec.minimum)) {
             const i = options.arrayIndex;
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
             specMin = valueSpec.minimum[i];
         }
         if (value < specMin) {
@@ -45,6 +44,7 @@ export default function validateNumber(options: NumberValidatorOptions): Validat
         let specMax = valueSpec.maximum;
         if (Array.isArray(valueSpec.maximum)) {
             const i = options.arrayIndex;
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
             specMax = valueSpec.maximum[i];
         }
         if (value > specMax) {

package/validate/validate_object.ts

@@ -8,8 +8,11 @@ import type {StyleSpecification, LayerSpecification} from '../types';
 type ObjectElementValidatorOptions = {
     key: string;
     value: unknown;
+    valueSpec?: unknown;
     style: Partial<StyleSpecification>;
     styleSpec: StyleReference;
+    object?: object;
+    objectKey?: string;
 };
 
 type ObjectValidatorOptions = {
@@ -39,6 +42,7 @@ export default function validateObject(options: ObjectValidatorOptions): Validat
     let errors: ValidationError[] = [];
     for (const objectKey in object) {
         const elementSpecKey = objectKey.split('.')[0]; // treat 'paint.*' as 'paint'
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         const elementSpec = elementSpecs[elementSpecKey] || elementSpecs['*'];
 
         let validateElement;
@@ -57,9 +61,11 @@ export default function validateObject(options: ObjectValidatorOptions): Validat
             continue;
         }
 
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-call
         errors = errors.concat(validateElement({
             key: (key ? `${key}.` : key) + objectKey,
             value: object[objectKey],
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
             valueSpec: elementSpec,
             style,
             styleSpec,
@@ -74,6 +80,7 @@ export default function validateObject(options: ObjectValidatorOptions): Validat
             continue;
         }
 
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         if (elementSpecs[elementSpecKey].required && elementSpecs[elementSpecKey]['default'] === undefined && object[elementSpecKey] === undefined) {
             errors.push(new ValidationError(key, object, `missing required property "${elementSpecKey}"`));
         }

package/validate/validate_projection.ts

@@ -15,6 +15,7 @@ type ProjectionValidatorOptions = {
 export default function validateProjection(options: ProjectionValidatorOptions): ValidationError[] {
     const projection = options.value;
     const styleSpec = options.styleSpec;
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const projectionSpec = styleSpec.projection;
     const style = options.style;
 
@@ -25,6 +26,7 @@ export default function validateProjection(options: ProjectionValidatorOptions):
             errors = errors.concat(validate({
                 key,
                 value: projection[key],
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
                 valueSpec: projectionSpec[key],
                 style,
                 styleSpec

package/validate/validate_property.ts

@@ -13,12 +13,12 @@ import type {StyleSpecification, LayerSpecification} from '../types';
 export type PropertyValidatorOptions = {
     key: string;
     value: unknown;
-    valueSpec: unknown;
+    valueSpec?: unknown;
     style: Partial<StyleSpecification>;
     styleSpec: StyleReference;
-    objectKey: string;
+    objectKey?: string;
     layerType: string;
-    layer: LayerSpecification;
+    layer?: Partial<LayerSpecification>;
 };
 
 export default function validateProperty(options: PropertyValidatorOptions, propertyType: string): ValidationError[] {
@@ -28,11 +28,13 @@ export default function validateProperty(options: PropertyValidatorOptions, prop
     const styleSpec = options.styleSpec;
     const value = options.value;
     const propertyKey = options.objectKey;
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const layerSpec = styleSpec[`${propertyType}_${options.layerType}`];
 
     if (!layerSpec) return [];
 
     const useThemeMatch = propertyKey.match(/^(.*)-use-theme$/);
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
     if (useThemeMatch && layerSpec[useThemeMatch[1]]) {
         if (isExpression(value)) {
             const errors: ValidationError[] = [];
@@ -67,22 +69,26 @@ export default function validateProperty(options: PropertyValidatorOptions, prop
     }
 
     const transitionMatch = propertyKey.match(/^(.*)-transition$/);
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
     if (propertyType === 'paint' && transitionMatch && layerSpec[transitionMatch[1]] && layerSpec[transitionMatch[1]].transition) {
         return validate({
             key,
             value,
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
             valueSpec: styleSpec.transition,
             style,
             styleSpec
         });
     }
 
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
     const valueSpec = options.valueSpec || layerSpec[propertyKey];
     if (!valueSpec) {
         return [new ValidationWarning(key, value, `unknown property "${propertyKey}"`)];
     }
 
     let tokenMatch: RegExpExecArray | undefined;
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
     if (isString(value) && supportsPropertyExpression(valueSpec) && !valueSpec.tokens && (tokenMatch = /^{([^}]+)}$/.exec(value))) {
         const example = `\`{ "type": "identity", "property": ${tokenMatch ? JSON.stringify(tokenMatch[1]) : '"_"'} }\``;
         return [new ValidationError(
@@ -101,13 +107,17 @@ export default function validateProperty(options: PropertyValidatorOptions, prop
             errors.push(new ValidationError(key, value, '"text-font" does not support identity functions'));
         }
     } else if (options.layerType === 'model' && propertyType === 'paint' && layer && layer.layout && layer.layout.hasOwnProperty('model-id')) {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         if (supportsPropertyExpression(valueSpec) && (supportsLightExpression(valueSpec) || supportsZoomExpression(valueSpec))) {
             // Performance related style spec limitation: zoom and light expressions are not allowed for e.g. trees.
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
             const expression = createPropertyExpression(deepUnbundle(value), valueSpec);
-            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
             const expressionObj = (expression.value as any).expression || (expression.value as any)._styleExpression.expression;
 
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
             if (expressionObj && !isGlobalPropertyConstant(expressionObj, ['measure-light'])) {
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
                 if (propertyKey !== 'model-emissive-strength' || (!isFeatureConstant(expressionObj) || !isStateConstant(expressionObj))) {
                     errors.push(new ValidationError(key, value, `${propertyKey} does not support measure-light expressions when the model layer source is vector tile or GeoJSON.`));
                 }
@@ -118,6 +128,7 @@ export default function validateProperty(options: PropertyValidatorOptions, prop
     return errors.concat(validate({
         key: options.key,
         value,
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         valueSpec,
         style,
         styleSpec,

package/validate/validate_rain.ts

@@ -16,6 +16,7 @@ export default function validateRain(options: RainValidatorOptions): ValidationE
     const rain = options.value;
     const style = options.style;
     const styleSpec = options.styleSpec;
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const rainSpec = styleSpec.rain;
 
     if (rain === undefined) {
@@ -30,18 +31,22 @@ export default function validateRain(options: RainValidatorOptions): ValidationE
     for (const key in rain) {
         const transitionMatch = key.match(/^(.*)-transition$/);
 
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         if (transitionMatch && rainSpec[transitionMatch[1]] && rainSpec[transitionMatch[1]].transition) {
             errors = errors.concat(validate({
                 key,
                 value: rain[key],
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
                 valueSpec: styleSpec.transition,
                 style,
                 styleSpec
             }));
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         } else if (rainSpec[key]) {
             errors = errors.concat(validate({
                 key,
                 value: rain[key],
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
                 valueSpec: rainSpec[key],
                 style,
                 styleSpec