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

package/validate/validate_projection.ts

@@ -4,6 +4,7 @@ import validate from './validate';
 
 import type {StyleReference} from '../reference/latest';
 import type {StyleSpecification} from '../types';
+import type {StylePropertySpecification} from '../style-spec';
 
 type ProjectionValidatorOptions = {
     key: string;
@@ -15,8 +16,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 projectionSpec = styleSpec.projection as Record<PropertyKey, StylePropertySpecification>;
     const style = options.style;
 
     if (isObject(projection)) {
@@ -26,7 +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

@@ -7,13 +7,15 @@ import {supportsLightExpression, supportsPropertyExpression, supportsZoomExpress
 import {isGlobalPropertyConstant, isFeatureConstant, isStateConstant} from '../expression/is_constant';
 import {createPropertyExpression, isExpression} from '../expression/index';
 
+import type {Expression} from '../expression/expression';
 import type {StyleReference} from '../reference/latest';
+import type {StylePropertySpecification} from '../style-spec';
 import type {StyleSpecification, LayerSpecification} from '../types';
 
 export type PropertyValidatorOptions = {
     key: string;
     value: unknown;
-    valueSpec?: unknown;
+    valueSpec?: StylePropertySpecification;
     style: Partial<StyleSpecification>;
     styleSpec: StyleReference;
     objectKey?: string;
@@ -28,29 +30,24 @@ 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}`];
+    const layerSpec = styleSpec[`${propertyType}_${options.layerType}`] as Record<string, StylePropertySpecification> | undefined;
 
     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)) {
+        if (isExpression(deepUnbundle(value))) {
             const errors: ValidationError[] = [];
             return errors.concat(validate({
-                key: options.key,
+                key,
                 value,
                 valueSpec: {
-                    "type": "string",
-                    "expression": {
-                        "interpolated": false,
-                        "parameters": [
-                            "zoom",
-                            "feature"
-                        ]
+                    type: 'string',
+                    expression: {
+                        interpolated: false,
+                        parameters: ['zoom', 'feature']
                     },
-                    "property-type": "data-driven"
+                    'property-type': 'data-driven'
                 },
                 style,
                 styleSpec,
@@ -59,6 +56,7 @@ export default function validateProperty(options: PropertyValidatorOptions, prop
                 propertyKey
             }));
         }
+
         return validate({
             key,
             value,
@@ -69,7 +67,6 @@ 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,
@@ -81,14 +78,12 @@ export default function validateProperty(options: PropertyValidatorOptions, prop
         });
     }
 
-    // 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(
@@ -107,17 +102,15 @@ 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, @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
+            const expressionValue = expression.value as {expression?: Expression} | {_styleExpression?: {expression?: Expression}};
+            const expressionObj = ('expression' in expressionValue && expressionValue.expression) ||
+                                  ('_styleExpression' in expressionValue && expressionValue._styleExpression && expressionValue._styleExpression.expression);
+
             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.`));
                 }
@@ -128,7 +121,6 @@ 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

@@ -4,6 +4,7 @@ import {getType, isObject} from '../util/get_type';
 
 import type {StyleReference} from '../reference/latest';
 import type {StyleSpecification} from '../types';
+import type {StylePropertySpecification} from '../style-spec';
 
 type RainValidatorOptions = {
     key: string;
@@ -16,8 +17,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;
+    const rainSpec = styleSpec.rain as Record<PropertyKey, StylePropertySpecification>;
 
     if (rain === undefined) {
         return [];
@@ -31,7 +31,6 @@ 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,
@@ -41,12 +40,11 @@ export default function validateRain(options: RainValidatorOptions): ValidationE
                 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

package/validate/validate_snow.ts

@@ -4,6 +4,7 @@ import {getType, isObject} from '../util/get_type';
 
 import type {StyleReference} from '../reference/latest';
 import type {StyleSpecification} from '../types';
+import type {StylePropertySpecification} from '../style-spec';
 
 type SnowValidatorOptions = {
     key: string;
@@ -16,8 +17,7 @@ export default function validateSnow(options: SnowValidatorOptions): ValidationE
     const snow = options.value;
     const style = options.style;
     const styleSpec = options.styleSpec;
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-    const snowSpec = styleSpec.snow;
+    const snowSpec = styleSpec.snow as Record<PropertyKey, StylePropertySpecification>;
 
     if (snow === undefined) {
         return [];
@@ -31,7 +31,6 @@ export default function validateSnow(options: SnowValidatorOptions): ValidationE
     for (const key in snow) {
         const transitionMatch = key.match(/^(.*)-transition$/);
 
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         if (transitionMatch && snowSpec[transitionMatch[1]] && snowSpec[transitionMatch[1]].transition) {
             errors = errors.concat(validate({
                 key,
@@ -41,12 +40,11 @@ export default function validateSnow(options: SnowValidatorOptions): ValidationE
                 style,
                 styleSpec
             }));
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         } else if (snowSpec[key]) {
             errors = errors.concat(validate({
                 key,
                 value: snow[key],
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
+
                 valueSpec: snowSpec[key],
                 style,
                 styleSpec

package/validate/validate_source.ts

@@ -135,17 +135,15 @@ export default function validateSource(options: SourceValidatorOptions): Validat
 }
 
 function getSourceTypeValues(styleSpec: StyleReference): string[] {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-    return styleSpec.source.reduce((memo: string[], source: string) => {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-        const sourceType = styleSpec[source];
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
+    const sourceArray = styleSpec.source as string[];
+    return sourceArray.reduce((memo: string[], source: string) => {
+
+        const sourceType = (styleSpec as Record<string, unknown>)[source] as {type: {type: string; values?: Record<string, unknown>}};
         if (sourceType.type.type === 'enum') {
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access
-            memo = memo.concat(Object.keys(sourceType.type.values));
+            memo = memo.concat(Object.keys(sourceType.type.values || {}));
         }
         return memo;
-    }, []) as string[];
+    }, []);
 }
 
 type PromoteIdValidatorOptions = {