@mapbox/mapbox-gl-style-spec 14.12.0-beta.1 → 14.13.0-beta.1

package/validate/validate_lights.ts

@@ -15,12 +15,14 @@ export default function validateLights(options: Options): Array<ValidationError>
     let errors = [];
 
     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;
     }
 
@@ -33,6 +35,7 @@ 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;
         }
     }
@@ -51,6 +54,7 @@ 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;
     }
 
@@ -62,10 +66,30 @@ 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) {
-                if (!lightPropertySpec[propertyKey]) {
+                const transitionMatch = propertyKey.match(/^(.*)-transition$/);
+                const useThemeMatch = propertyKey.match(/^(.*)-use-theme$/);
+
+                if (useThemeMatch && lightPropertySpec[useThemeMatch[1]]) {
+                    errors = errors.concat(validate({
+                        key,
+                        value: properties[propertyKey],
+                        valueSpec: {type: 'string'},
+                        style,
+                        styleSpec
+                    }));
+                } else if (transitionMatch && lightPropertySpec[transitionMatch[1]] && lightPropertySpec[transitionMatch[1]].transition) {
+                    errors = errors.concat(validate({
+                        key,
+                        value: light[key],
+                        valueSpec: styleSpec.transition,
+                        style,
+                        styleSpec
+                    }));
+                } else if (!lightPropertySpec[propertyKey]) {
                     errors = errors.concat([new ValidationWarning(options.key, properties[propertyKey], `unknown property "${propertyKey}"`)]);
                 } else {
                     errors = errors.concat(validate({
@@ -78,26 +102,7 @@ export default function validateLights(options: Options): Array<ValidationError>
                 }
             }
         } else {
-            const transitionMatch = key.match(/^(.*)-transition$/);
-            const useThemeMatch = key.match(/^(.*)-use-theme$/);
-
-            if (useThemeMatch && lightSpec[useThemeMatch[1]]) {
-                errors = errors.concat(validate({
-                    key,
-                    value: light[key],
-                    valueSpec: {type: 'string'},
-                    style,
-                    styleSpec
-                }));
-            } else if (transitionMatch && lightSpec[transitionMatch[1]] && lightSpec[transitionMatch[1]].transition) {
-                errors = errors.concat(validate({
-                    key,
-                    value: light[key],
-                    valueSpec: styleSpec.transition,
-                    style,
-                    styleSpec
-                }));
-            } else if (lightSpec[key]) {
+            if (lightSpec[key]) {
                 errors = errors.concat(validate({
                     key,
                     value: light[key],
@@ -111,5 +116,6 @@ export default function validateLights(options: Options): Array<ValidationError>
         }
     }
 
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return errors;
 }

package/validate/validate_model.ts

@@ -9,6 +9,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) {
         return false;
     }
@@ -19,12 +20,14 @@ export default function validateModel(options: ValidationOptions): Array<Validat
     let errors = [];
 
     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;
     }
 
@@ -32,5 +35,6 @@ 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_object.ts

@@ -7,7 +7,7 @@ import type {LayerSpecification} from '../types';
 
 type Options = ValidationOptions & {
     layer?: LayerSpecification;
-    objectElementValidators?: any;
+    objectElementValidators?: object;
 };
 
 export default function validateObject(options: Options): Array<ValidationError> {
@@ -17,7 +17,7 @@ export default function validateObject(options: Options): Array<ValidationError>
     const elementValidators = options.objectElementValidators || {};
     const style = options.style;
     const styleSpec = options.styleSpec;
-    let errors = [];
+    let errors: ValidationError[] = [];
 
     const type = getType(object);
     if (type !== 'object') {

package/validate/validate_projection.ts

@@ -28,5 +28,6 @@ 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

@@ -12,6 +12,7 @@ import type {ValidationOptions} from './validate';
 export type PropertyValidationOptions = ValidationOptions & {
     objectKey: string;
     layerType: string;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     layer: any;
 };
 
@@ -30,6 +31,7 @@ export default function validateProperty(options: PropertyValidationOptions, pro
     if (propertyType === 'paint' && useThemeMatch && layerSpec[useThemeMatch[1]]) {
         if (isExpression(value)) {
             const errors = [];
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-return
             return errors.concat(validate({
                 key: options.key,
                 value,
@@ -99,6 +101,7 @@ export default function validateProperty(options: PropertyValidationOptions, pro
         if (supportsPropertyExpression(valueSpec) && (supportsLightExpression(valueSpec) || supportsZoomExpression(valueSpec))) {
             // Performance related style spec limitation: zoom and light expressions are not allowed for e.g. trees.
             const expression = createPropertyExpression(deepUnbundle(value), valueSpec);
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
             const expressionObj = (expression.value as any).expression || (expression.value as any)._styleExpression.expression;
 
             if (expressionObj && !isGlobalPropertyConstant(expressionObj, ['measure-light'])) {
@@ -109,6 +112,7 @@ export default function validateProperty(options: PropertyValidationOptions, pro
         }
     }
 
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return errors.concat(validate({
         key: options.key,
         value,

package/validate/validate_rain.ts

@@ -13,9 +13,11 @@ export default function validateRain(options: ValidationOptions): Array<Validati
 
     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;
     }
 
@@ -43,5 +45,6 @@ export default function validateRain(options: ValidationOptions): Array<Validati
         }
     }
 
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return errors;
 }

package/validate/validate_snow.ts

@@ -13,9 +13,11 @@ export default function validateSnow(options: ValidationOptions): Array<Validati
 
     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;
     }
 
@@ -43,5 +45,6 @@ export default function validateSnow(options: ValidationOptions): Array<Validati
         }
     }
 
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return errors;
 }

package/validate/validate_source.ts

@@ -26,7 +26,7 @@ export default function validateSource(options: ValidationOptions): Array<Valida
     }
 
     const type = unbundle(value.type) as string;
-    let errors = [];
+    let errors: ValidationError[] = [];
 
     if (['vector', 'raster', 'raster-dem', 'raster-array'].includes(type)) {
         if (!value.url && !value.tiles) {
@@ -48,7 +48,6 @@ export default function validateSource(options: ValidationOptions): Array<Valida
             objectElementValidators
         }));
         return errors;
-
     case 'geojson':
         errors = validateObject({
             key,
@@ -58,6 +57,7 @@ export default function validateSource(options: ValidationOptions): Array<Valida
             styleSpec,
             objectElementValidators
         });
+
         if (value.cluster) {
             for (const prop in value.clusterProperties) {
                 const [operator, mapExpr] = value.clusterProperties[prop];
@@ -75,8 +75,8 @@ export default function validateSource(options: ValidationOptions): Array<Valida
                 }));
             }
         }
-        return errors;
 
+        return errors;
     case 'video':
         return validateObject({
             key,
@@ -110,7 +110,8 @@ export default function validateSource(options: ValidationOptions): Array<Valida
 }
 
 function getSourceTypeValues(styleSpec: StyleReference) {
-    return styleSpec.source.reduce((memo, source) => {
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
+    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));
@@ -126,7 +127,7 @@ function validatePromoteId({
     if (getType(value) === 'string') {
         return validateString({key, value});
     } else if (Array.isArray(value)) {
-        const errors = [];
+        const errors: ValidationError[] = [];
         const unbundledValue = deepUnbundle(value);
         const expression = createExpression(unbundledValue);
         if (expression.result === 'error') {
@@ -144,10 +145,11 @@ function validatePromoteId({
 
         return errors;
     } else {
-        const errors = [];
+        const errors: ValidationError[] = [];
         for (const prop in value) {
             errors.push(...validatePromoteId({key: `${key}.${prop}`, value: value[prop]}));
         }
+
         return errors;
     }
 }

package/validate/validate_terrain.ts

@@ -15,11 +15,14 @@ export default function validateTerrain(options: ValidationOptions): Array<Valid
 
     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;
     }
 
@@ -68,5 +71,6 @@ 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

@@ -4,7 +4,19 @@ import readStyle from './read_style';
 import ValidationError from './error/validation_error';
 import getType from './util/get_type';
 
+import type {StyleReference} from './reference/latest';
 import type {ValidationErrors} from './validate_style.min';
+import type {
+    StyleSpecification,
+    SourceSpecification,
+    SourcesSpecification,
+    ImportSpecification
+} from './types';
+
+type MapboxStyleSpecification = StyleSpecification & {
+    visibility?: 'public' | 'private';
+    protected?: boolean;
+};
 
 const SUPPORTED_SPEC_VERSION = 8;
 const MAX_SOURCES_IN_STYLE = 15;
@@ -14,17 +26,17 @@ function isValid(value: string | null | undefined, regex: RegExp): boolean {
     return !!value.match(regex);
 }
 
-function getSourceCount(source: any): number {
-    if (source.url) {
+function getSourceCount(source: SourceSpecification): number {
+    if ('url' in source) {
         return source.url.split(',').length;
     } else {
         return 0;
     }
 }
 
-function getAllowedKeyErrors(obj: any, keys: Array<any>, path?: string | null): Array<ValidationError> {
+function getAllowedKeyErrors(obj: object, keys: string[], path?: string | null): Array<ValidationError> {
     const allowed = new Set(keys);
-    const errors = [];
+    const errors: ValidationError[] = [];
     Object.keys(obj).forEach(k => {
         if (!allowed.has(k)) {
             const prop = path ? `${path}.${k}` : null;
@@ -34,9 +46,9 @@ function getAllowedKeyErrors(obj: any, keys: Array<any>, path?: string | null):
     return errors;
 }
 
-const acceptedSourceTypes = new Set(["vector", "raster", "raster-dem", "raster-array", "model", "batched-model"]);
-function getSourceErrors(source: any, i: number): Array<ValidationError> {
-    const errors = [];
+const acceptedSourceTypes = new Set<SourceSpecification['type']>(['vector', 'raster', 'raster-dem', 'raster-array', 'model', 'batched-model']);
+function getSourceErrors(source: SourceSpecification, i: number): Array<ValidationError> {
+    const errors: ValidationError[] = [];
 
     /*
      * Inlined sources are not supported by the Mapbox Styles API, so only
@@ -48,7 +60,7 @@ function getSourceErrors(source: any, i: number): Array<ValidationError> {
     /*
      * "type" is required and must be one of "vector", "raster", "raster-dem", "raster-array"
      */
-    if (!acceptedSourceTypes.has(String(source.type))) {
+    if (!acceptedSourceTypes.has(String(source.type) as SourceSpecification['type'])) {
         errors.push(new ValidationError(`sources[${i}].type`, source.type, `Expected one of [${Array.from(acceptedSourceTypes).join(", ")}]`));
     }
 
@@ -59,22 +71,22 @@ function getSourceErrors(source: any, i: number): Array<ValidationError> {
      * mapbox://mapbox.abcd1234,penny.abcd1234
      */
     const sourceUrlPattern = /^mapbox:\/\/([^/]*)$/;
-    if (!source.url || !isValid(source.url, sourceUrlPattern)) {
-        errors.push(new ValidationError(`sources[${i}].url`, source.url, 'Expected a valid Mapbox tileset url'));
+    if (!('url' in source) || !isValid(source.url, sourceUrlPattern)) {
+        errors.push(new ValidationError(`sources[${i}].url`, (source as {url?: string}).url, 'Expected a valid Mapbox tileset url'));
     }
 
     return errors;
 }
 
 function getMaxSourcesErrors(sourcesCount: number): Array<ValidationError> {
-    const errors = [];
+    const errors: ValidationError[] = [];
     if (sourcesCount > MAX_SOURCES_IN_STYLE) {
         errors.push(new ValidationError('sources', null, `Styles must contain ${MAX_SOURCES_IN_STYLE} or fewer sources`));
     }
     return errors;
 }
 
-function getSourcesErrors(sources: any): {
+function getSourcesErrors(sources: SourcesSpecification): {
     errors: Array<ValidationError>;
     sourcesCount: number;
 } {
@@ -95,14 +107,11 @@ function getSourcesErrors(sources: any): {
     return {errors, sourcesCount};
 }
 
-function getImportErrors(imports: Array<any> = []): {
-    errors: Array<ValidationError>;
-    sourcesCount: number;
-} {
+function getImportErrors(imports: ImportSpecification[] = []): {errors: Array<ValidationError>; sourcesCount: number} {
     let errors: Array<ValidationError> = [];
 
     let sourcesCount = 0;
-    const validateImports = (imports: Array<any> = []) => {
+    const validateImports = (imports: ImportSpecification[] = []) => {
         for (const importSpec of imports) {
             const style = importSpec.data;
             if (!style) continue;
@@ -129,7 +138,7 @@ function getImportErrors(imports: Array<any> = []): {
     return {errors, sourcesCount};
 }
 
-function getRootErrors(style: any, specKeys: Array<any>): Array<ValidationError> {
+function getRootErrors(style: MapboxStyleSpecification, specKeys: string[]): Array<ValidationError> {
     const errors = [];
 
     /*
@@ -195,6 +204,7 @@ function getRootErrors(style: any, specKeys: Array<any>): Array<ValidationError>
         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;
 }
 
@@ -208,11 +218,12 @@ function getRootErrors(style: any, specKeys: Array<any>): Array<ValidationError>
  *   var validateMapboxApiSupported = require('mapbox-gl-style-spec/lib/validate_style_mapbox_api_supported.js');
  *   var errors = validateMapboxApiSupported(style);
  */
-export default function validateMapboxApiSupported(style: any, styleSpec: any = v8): ValidationErrors {
+export default function validateMapboxApiSupported(style: MapboxStyleSpecification, styleSpec: StyleReference = v8): ValidationErrors {
     let s = style;
     try {
         s = readStyle(s);
     } catch (e) {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return [e];
     }
 

package/validate_style.ts

@@ -28,6 +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];
     }
 

package/visit.ts

@@ -11,11 +11,13 @@ 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];
         }
     }
     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];
         }
     }
@@ -57,7 +59,7 @@ export function eachProperty(
 ) {
     function inner(layer: LayerSpecification, propertyType: 'paint' | 'layout') {
         if (layer.type === 'slot' || layer.type === 'clip') return;
-        const properties = (layer[propertyType] as any);
+        const properties = layer[propertyType];
         if (!properties) return;
         Object.keys(properties).forEach((key) => {
             callback({