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

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;
 }

package/validate/validate_function.ts

@@ -14,8 +14,7 @@ import {
 
 import type {ValidationOptions} from './validate';
 
-// eslint-disable-next-line @typescript-eslint/no-explicit-any
-export default function validateFunction(options: ValidationOptions): any {
+export default function validateFunction(options: ValidationOptions): ValidationError[] {
     const functionValueSpec = options.valueSpec;
     const functionType = unbundle(options.value.type);
     let stopKeyType;
@@ -68,12 +67,12 @@ export default function validateFunction(options: ValidationOptions): any {
 
     return errors;
 
-    function validateFunctionStops(options: ValidationOptions) {
+    function validateFunctionStops(options: ValidationOptions): ValidationError[] {
         if (functionType === 'identity') {
             return [new ValidationError(options.key, options.value, 'identity function may not have a "stops" property')];
         }
 
-        let errors = [];
+        let errors: ValidationError[] = [];
         const value = options.value;
 
         errors = errors.concat(validateArray({
@@ -89,12 +88,11 @@ export default function validateFunction(options: ValidationOptions): any {
             errors.push(new ValidationError(options.key, value, 'array must have at least one stop'));
         }
 
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return errors;
     }
 
-    function validateFunctionStop(options: ValidationOptions) {
-        let errors = [];
+    function validateFunctionStop(options: ValidationOptions): ValidationError[] {
+        let errors: ValidationError[] = [];
         const value = options.value;
         const key = options.key;
 
@@ -149,11 +147,9 @@ export default function validateFunction(options: ValidationOptions): any {
         }
 
         if (isExpression(deepUnbundle(value[1]))) {
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
             return errors.concat([new ValidationError(`${key}[1]`, value[1], 'expressions are not allowed in function stops.')]);
         }
 
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return errors.concat(validate({
             key: `${key}[1]`,
             value: value[1],
@@ -164,7 +160,7 @@ export default function validateFunction(options: ValidationOptions): any {
     }
 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    function validateStopDomainValue(options: ValidationOptions, stop: any) {
+    function validateStopDomainValue(options: ValidationOptions, stop: any): ValidationError[] {
         const type = getType(options.value);
         const value = unbundle(options.value);
 

package/validate/validate_iconset.ts

@@ -16,7 +16,7 @@ export default function validateIconset(options: ValidationOptions): Array<Valid
 
     const type = unbundle(iconset.type) as string;
 
-    let errors = [];
+    let errors: ValidationError[] = [];
 
     errors = errors.concat(validateObject({
         key,
@@ -36,6 +36,5 @@ export default function validateIconset(options: ValidationOptions): Array<Valid
         }
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return errors;
 }

package/validate/validate_layer.ts

@@ -16,7 +16,7 @@ type Options = ValidationOptions & {
 };
 
 export default function validateLayer(options: Options): Array<ValidationError> {
-    let errors = [];
+    let errors: ValidationError[] = [];
 
     const layer = options.value;
     const key = options.key;
@@ -146,6 +146,5 @@ export default function validateLayer(options: Options): Array<ValidationError>
         }
     }));
 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return errors;
 }

package/validate/validate_light.ts

@@ -10,15 +10,13 @@ export default function validateLight(options: ValidationOptions): Array<Validat
     const lightSpec = styleSpec.light;
     const style = options.style;
 
-    let errors = [];
+    let errors: ValidationError[] = [];
 
     const rootType = getType(light);
     if (light === undefined) {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return errors;
     } else if (rootType !== 'object') {
         errors = errors.concat([new ValidationError('light', light, `object expected, ${rootType} found`)]);
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return errors;
     }
 
@@ -55,6 +53,5 @@ export default function validateLight(options: ValidationOptions): Array<Validat
         }
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return errors;
 }

package/validate/validate_lights.ts

@@ -12,17 +12,15 @@ type Options = ValidationOptions & {
 
 export default function validateLights(options: Options): Array<ValidationError> {
     const light = options.value;
-    let errors = [];
+    let errors: ValidationError[] = [];
 
     if (!light) {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return errors;
     }
 
     const type = getType(light);
     if (type !== 'object') {
         errors = errors.concat([new ValidationError('light-3d', light, `object expected, ${type} found`)]);
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return errors;
     }
 
@@ -35,7 +33,6 @@ export default function validateLights(options: Options): Array<ValidationError>
     for (const key of ['type', 'id']) {
         if (!(key in light)) {
             errors = errors.concat([new ValidationError('light-3d', light, `missing property ${key} on light`)]);
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
             return errors;
         }
     }
@@ -54,7 +51,6 @@ export default function validateLights(options: Options): Array<ValidationError>
     const lightType = `properties_light_${light['type']}`;
     if (!(lightType in styleSpec)) {
         errors = errors.concat([new ValidationError('light-3d', light, `Invalid light type ${light['type']}`)]);
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return errors;
     }
 
@@ -66,7 +62,6 @@ export default function validateLights(options: Options): Array<ValidationError>
             const propertiesType = getType(properties);
             if (propertiesType !== 'object') {
                 errors = errors.concat([new ValidationError('properties', properties, `object expected, ${propertiesType} found`)]);
-                // eslint-disable-next-line @typescript-eslint/no-unsafe-return
                 return errors;
             }
             for (const propertyKey in properties) {
@@ -116,6 +111,5 @@ export default function validateLights(options: Options): Array<ValidationError>
         }
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return errors;
 }

package/validate/validate_model.ts

@@ -17,17 +17,15 @@ export function isValidUrl(str: string, allowRelativeUrls: boolean): boolean {
 
 export default function validateModel(options: ValidationOptions): Array<ValidationError> {
     const url = options.value;
-    let errors = [];
+    let errors: ValidationError[] = [];
 
     if (!url) {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return errors;
     }
 
     const type = getType(url);
     if (type !== 'string') {
         errors = errors.concat([new ValidationError(options.key, url, `string expected, "${type}" found`)]);
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return errors;
     }
 
@@ -35,6 +33,5 @@ export default function validateModel(options: ValidationOptions): Array<Validat
         errors = errors.concat([new ValidationError(options.key, url, `invalid url "${url}"`)]);
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return errors;
 }

package/validate/validate_projection.ts

@@ -10,7 +10,7 @@ export default function validateProjection(options: ValidationOptions): Array<Va
     const projectionSpec = styleSpec.projection;
     const style = options.style;
 
-    let errors = [];
+    let errors: ValidationError[] = [];
 
     const rootType = getType(projection);
 
@@ -28,6 +28,5 @@ export default function validateProjection(options: ValidationOptions): Array<Va
         errors = errors.concat([new ValidationError('projection', projection, `object or string expected, ${rootType} found`)]);
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return errors;
 }

package/validate/validate_property.ts

@@ -30,8 +30,7 @@ export default function validateProperty(options: PropertyValidationOptions, pro
     const useThemeMatch = propertyKey.match(/^(.*)-use-theme$/);
     if (propertyType === 'paint' && useThemeMatch && layerSpec[useThemeMatch[1]]) {
         if (isExpression(value)) {
-            const errors = [];
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+            const errors: ValidationError[] = [];
             return errors.concat(validate({
                 key: options.key,
                 value,
@@ -48,7 +47,6 @@ export default function validateProperty(options: PropertyValidationOptions, pro
                 },
                 style,
                 styleSpec,
-                // @ts-expect-error - TS2353 - Object literal may only specify known properties, and 'expressionContext' does not exist in type 'ValidationOptions'.
                 expressionContext: 'property',
                 propertyType,
                 propertyKey
@@ -88,7 +86,7 @@ export default function validateProperty(options: PropertyValidationOptions, pro
                 `Use an identity property function instead: ${example}.`)];
     }
 
-    const errors = [];
+    const errors: ValidationError[] = [];
 
     if (options.layerType === 'symbol') {
         if (propertyKey === 'text-field' && style && !style.glyphs && !style.imports) {
@@ -112,14 +110,12 @@ export default function validateProperty(options: PropertyValidationOptions, pro
         }
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return errors.concat(validate({
         key: options.key,
         value,
         valueSpec,
         style,
         styleSpec,
-        // @ts-expect-error - TS2353 - Object literal may only specify known properties, and 'expressionContext' does not exist in type 'ValidationOptions'.
         expressionContext: 'property',
         propertyType,
         propertyKey

package/validate/validate_rain.ts

@@ -9,15 +9,13 @@ export default function validateRain(options: ValidationOptions): Array<Validati
     const style = options.style;
     const styleSpec = options.styleSpec;
     const rainSpec = styleSpec.rain;
-    let errors = [];
+    let errors: ValidationError[] = [];
 
     const rootType = getType(rain);
     if (rain === undefined) {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return errors;
     } else if (rootType !== 'object') {
         errors = errors.concat([new ValidationError('rain', rain, `object expected, ${rootType} found`)]);
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return errors;
     }
 
@@ -45,6 +43,5 @@ export default function validateRain(options: ValidationOptions): Array<Validati
         }
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return errors;
 }

package/validate/validate_snow.ts

@@ -9,15 +9,13 @@ export default function validateSnow(options: ValidationOptions): Array<Validati
     const style = options.style;
     const styleSpec = options.styleSpec;
     const snowSpec = styleSpec.snow;
-    let errors = [];
+    let errors: ValidationError[] = [];
 
     const rootType = getType(snow);
     if (snow === undefined) {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return errors;
     } else if (rootType !== 'object') {
         errors = errors.concat([new ValidationError('snow', snow, `object expected, ${rootType} found`)]);
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return errors;
     }
 
@@ -45,6 +43,5 @@ export default function validateSnow(options: ValidationOptions): Array<Validati
         }
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return errors;
 }

package/validate/validate_source.ts

@@ -109,15 +109,14 @@ export default function validateSource(options: ValidationOptions): Array<Valida
     }
 }
 
-function getSourceTypeValues(styleSpec: StyleReference) {
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+function getSourceTypeValues(styleSpec: StyleReference): string[] {
     return styleSpec.source.reduce((memo: string[], source: string) => {
         const sourceType = styleSpec[source];
         if (sourceType.type.type === 'enum') {
             memo = memo.concat(Object.keys(sourceType.type.values));
         }
         return memo;
-    }, []);
+    }, []) as string[];
 }
 
 function validatePromoteId({

package/validate/validate_terrain.ts

@@ -11,18 +11,15 @@ export default function validateTerrain(options: ValidationOptions): Array<Valid
     const style = options.style;
     const styleSpec = options.styleSpec;
     const terrainSpec = styleSpec.terrain;
-    let errors = [];
+    let errors: ValidationError[] = [];
 
     const rootType = getType(terrain);
     if (terrain === undefined) {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return errors;
     } else if (rootType === 'null') {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return errors;
     } else if (rootType !== 'object') {
         errors = errors.concat([new ValidationError('terrain', terrain, `object expected, ${rootType} found`)]);
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return errors;
     }
 
@@ -71,6 +68,5 @@ export default function validateTerrain(options: ValidationOptions): Array<Valid
         }
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return errors;
 }

package/validate_mapbox_api_supported.ts

@@ -139,7 +139,7 @@ function getImportErrors(imports: ImportSpecification[] = []): {errors: Array<Va
 }
 
 function getRootErrors(style: MapboxStyleSpecification, specKeys: string[]): Array<ValidationError> {
-    const errors = [];
+    const errors: ValidationError[] = [];
 
     /*
      * The following keys are optional but fully managed by the Mapbox Styles
@@ -204,7 +204,6 @@ function getRootErrors(style: MapboxStyleSpecification, specKeys: string[]): Arr
         errors.push(new ValidationError('protected', style.protected, 'Style protection must be true or false'));
     }
 
-    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return errors;
 }
 
@@ -223,8 +222,7 @@ export default function validateMapboxApiSupported(style: MapboxStyleSpecificati
     try {
         s = readStyle(s);
     } catch (e) {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-        return [e];
+        return [e] as ValidationErrors;
     }
 
     let errors = validateStyle(s, styleSpec)

package/validate_style.ts

@@ -28,8 +28,7 @@ export default function validateStyle(style: StyleSpecification | string | Buffe
     try {
         s = readStyle(s);
     } catch (e) {
-        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-        return [e];
+        return [e] as ValidationErrors;
     }
 
     return validateStyleMin(s, styleSpec);

package/visit.ts

@@ -11,14 +11,12 @@ import type {
 function getPropertyReference(propertyName: string): StylePropertySpecification {
     for (let i = 0; i < Reference.layout.length; i++) {
         for (const key in Reference[Reference.layout[i]]) {
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-            if (key === propertyName) return Reference[Reference.layout[i]][key];
+            if (key === propertyName) return Reference[Reference.layout[i]][key] as StylePropertySpecification;
         }
     }
     for (let i = 0; i < Reference.paint.length; i++) {
         for (const key in Reference[Reference.paint[i]]) {
-            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
-            if (key === propertyName) return Reference[Reference.paint[i]][key];
+            if (key === propertyName) return Reference[Reference.paint[i]][key] as StylePropertySpecification;
         }
     }