@mapbox/mapbox-gl-style-spec 13.24.0-alpha.6 → 13.24.0-beta.1

package/validate/validate_fog.js

@@ -1,9 +1,12 @@
+// @flow
 
 import ValidationError from '../error/validation_error.js';
 import validate from './validate.js';
 import getType from '../util/get_type.js';
 
-export default function validateFog(options) {
+import type {ValidationOptions} from './validate.js';
+
+export default function validateFog(options: ValidationOptions): Array<ValidationError> {
     const fog = options.value;
     const style = options.style;
     const styleSpec = options.styleSpec;

package/validate/validate_formatted.js

@@ -1,8 +1,12 @@
 // @flow
+
 import validateExpression from './validate_expression.js';
 import validateString from './validate_string.js';
 
-export default function validateFormatted(options: any) {
+import type {ValidationOptions} from './validate.js';
+import type ValidationError from '../error/validation_error.js';
+
+export default function validateFormatted(options: ValidationOptions): Array<ValidationError> {
     if (validateString(options).length === 0) {
         return [];
     }

package/validate/validate_function.js

@@ -1,3 +1,4 @@
+// @flow
 
 import ValidationError from '../error/validation_error.js';
 import getType from '../util/get_type.js';
@@ -13,11 +14,13 @@ import {
     supportsInterpolation
 } from '../util/properties.js';
 
-export default function validateFunction(options) {
+import type {ValidationOptions} from './validate.js';
+
+export default function validateFunction(options: ValidationOptions): any {
     const functionValueSpec = options.valueSpec;
     const functionType = unbundle(options.value.type);
     let stopKeyType;
-    let stopDomainValues = {};
+    let stopDomainValues: {[string | number]: boolean} = {};
     let previousStopDomainValue;
     let previousStopDomainZoom;
 
@@ -66,7 +69,7 @@ export default function validateFunction(options) {
 
     return errors;
 
-    function validateFunctionStops(options) {
+    function validateFunctionStops(options: ValidationOptions) {
         if (functionType === 'identity') {
             return [new ValidationError(options.key, options.value, 'identity function may not have a "stops" property')];
         }
@@ -90,7 +93,7 @@ export default function validateFunction(options) {
         return errors;
     }
 
-    function validateFunctionStop(options) {
+    function validateFunctionStop(options: ValidationOptions) {
         let errors = [];
         const value = options.value;
         const key = options.key;
@@ -113,11 +116,17 @@ export default function validateFunction(options) {
             if (value[0].value === undefined) {
                 return [new ValidationError(key, value, 'object stop key must have value')];
             }
-            if (previousStopDomainZoom && previousStopDomainZoom > unbundle(value[0].zoom)) {
+
+            const nextStopDomainZoom = unbundle(value[0].zoom);
+            if (typeof nextStopDomainZoom !== 'number') {
+                return [new ValidationError(key, value[0].zoom, 'stop zoom values must be numbers')];
+            }
+
+            if (previousStopDomainZoom && previousStopDomainZoom > nextStopDomainZoom) {
                 return [new ValidationError(key, value[0].zoom, 'stop zoom values must appear in ascending order')];
             }
-            if (unbundle(value[0].zoom) !== previousStopDomainZoom) {
-                previousStopDomainZoom = unbundle(value[0].zoom);
+            if (nextStopDomainZoom !== previousStopDomainZoom) {
+                previousStopDomainZoom = nextStopDomainZoom;
                 previousStopDomainValue = undefined;
                 stopDomainValues = {};
             }
@@ -152,7 +161,7 @@ export default function validateFunction(options) {
         }));
     }
 
-    function validateStopDomainValue(options, stop) {
+    function validateStopDomainValue(options: ValidationOptions, stop) {
         const type = getType(options.value);
         const value = unbundle(options.value);
 
@@ -164,7 +173,7 @@ export default function validateFunction(options) {
             return [new ValidationError(options.key, reportValue, `${type} stop domain type must match previous stop domain type ${stopKeyType}`)];
         }
 
-        if (type !== 'number' && type !== 'string' && type !== 'boolean') {
+        if (type !== 'number' && type !== 'string' && type !== 'boolean' && typeof value !== 'number' && typeof value !== 'string' && typeof value !== 'boolean') {
             return [new ValidationError(options.key, reportValue, 'stop domain value must be a number, string, or boolean')];
         }
 
@@ -176,26 +185,26 @@ export default function validateFunction(options) {
             return [new ValidationError(options.key, reportValue, message)];
         }
 
-        if (functionType === 'categorical' && type === 'number' && (!isFinite(value) || Math.floor(value) !== value)) {
-            return [new ValidationError(options.key, reportValue, `integer expected, found ${value}`)];
+        if (functionType === 'categorical' && type === 'number' && (typeof value !== 'number' || !isFinite(value) || Math.floor(value) !== value)) {
+            return [new ValidationError(options.key, reportValue, `integer expected, found ${String(value)}`)];
         }
 
-        if (functionType !== 'categorical' && type === 'number' && previousStopDomainValue !== undefined && value < previousStopDomainValue) {
+        if (functionType !== 'categorical' && type === 'number' && typeof value === 'number' && typeof previousStopDomainValue === 'number' && previousStopDomainValue !== undefined && value < previousStopDomainValue) {
             return [new ValidationError(options.key, reportValue, 'stop domain values must appear in ascending order')];
         } else {
             previousStopDomainValue = value;
         }
 
-        if (functionType === 'categorical' && value in stopDomainValues) {
+        if (functionType === 'categorical' && (value: any) in stopDomainValues) {
             return [new ValidationError(options.key, reportValue, 'stop domain values must be unique')];
         } else {
-            stopDomainValues[value] = true;
+            stopDomainValues[(value: any)] = true;
         }
 
         return [];
     }
 
-    function validateFunctionDefault(options) {
+    function validateFunctionDefault(options: ValidationOptions) {
         return validate({
             key: options.key,
             value: options.value,

package/validate/validate_glyphs_url.js

@@ -1,8 +1,11 @@
+// @flow
 
 import ValidationError from '../error/validation_error.js';
 import validateString from './validate_string.js';
 
-export default function(options) {
+import type {ValidationOptions} from './validate.js';
+
+export default function(options: ValidationOptions): Array<ValidationError> {
     const value = options.value;
     const key = options.key;
 

package/validate/validate_image.js

@@ -1,8 +1,12 @@
 // @flow
+
 import validateExpression from './validate_expression.js';
 import validateString from './validate_string.js';
 
-export default function validateImage(options: any) {
+import type {ValidationOptions} from './validate.js';
+import type ValidationError from '../error/validation_error.js';
+
+export default function validateImage(options: ValidationOptions): Array<ValidationError> {
     if (validateString(options).length === 0) {
         return [];
     }

package/validate/validate_layer.js

@@ -1,3 +1,4 @@
+// @flow
 
 import ValidationError from '../error/validation_error.js';
 import {unbundle} from '../util/unbundle_jsonlint.js';
@@ -8,7 +9,15 @@ import validateLayoutProperty from './validate_layout_property.js';
 import validateSpec from './validate.js';
 import extend from '../util/extend.js';
 
-export default function validateLayer(options) {
+import type {ValidationOptions} from './validate.js';
+import type {LayerSpecification} from '../types.js';
+
+type Options = ValidationOptions & {
+    value: LayerSpecification;
+    arrayIndex: number;
+}
+
+export default function validateLayer(options: Options): Array<ValidationError> {
     let errors = [];
 
     const layer = options.value;
@@ -27,6 +36,7 @@ export default function validateLayer(options) {
         for (let i = 0; i < options.arrayIndex; i++) {
             const otherLayer = style.layers[i];
             if (unbundle(otherLayer.id) === layerId) {
+                // $FlowFixMe[prop-missing] - id.__line__ is added dynamically during the readStyle step
                 errors.push(new ValidationError(key, layer.id, `duplicate layer id "${layer.id}", previously used at line ${otherLayer.id.__line__}`));
             }
         }
@@ -46,7 +56,8 @@ export default function validateLayer(options) {
         });
 
         if (!parent) {
-            errors.push(new ValidationError(key, layer.ref, `ref layer "${ref}" not found`));
+            if (typeof ref === 'string')
+                errors.push(new ValidationError(key, layer.ref, `ref layer "${ref}" not found`));
         } else if (parent.ref) {
             errors.push(new ValidationError(key, layer.ref, 'ref cannot reference another ref layer'));
         } else {
@@ -106,6 +117,7 @@ export default function validateLayer(options) {
                     layer,
                     key: options.key,
                     value: options.value,
+                    valueSpec: {},
                     style: options.style,
                     styleSpec: options.styleSpec,
                     objectElementValidators: {
@@ -120,6 +132,7 @@ export default function validateLayer(options) {
                     layer,
                     key: options.key,
                     value: options.value,
+                    valueSpec: {},
                     style: options.style,
                     styleSpec: options.styleSpec,
                     objectElementValidators: {

package/validate/validate_layout_property.js

@@ -1,6 +1,10 @@
+// @flow
 
 import validateProperty from './validate_property.js';
 
-export default function validateLayoutProperty(options) {
+import type ValidationError from '../error/validation_error.js';
+import type {PropertyValidationOptions} from './validate_property.js';
+
+export default function validateLayoutProperty(options: PropertyValidationOptions): Array<ValidationError> {
     return validateProperty(options, 'layout');
 }

package/validate/validate_light.js

@@ -1,9 +1,12 @@
+// @flow
 
 import ValidationError from '../error/validation_error.js';
 import getType from '../util/get_type.js';
 import validate from './validate.js';
 
-export default function validateLight(options) {
+import type {ValidationOptions} from './validate.js';
+
+export default function validateLight(options: ValidationOptions): Array<ValidationError> {
     const light = options.value;
     const styleSpec = options.styleSpec;
     const lightSpec = styleSpec.light;

package/validate/validate_number.js

@@ -1,8 +1,15 @@
+// @flow
 
 import getType from '../util/get_type.js';
 import ValidationError from '../error/validation_error.js';
 
-export default function validateNumber(options) {
+import type {ValidationOptions} from './validate.js';
+
+type Options = ValidationOptions & {
+    arrayIndex: number;
+}
+
+export default function validateNumber(options: Options): Array<ValidationError> {
     const key = options.key;
     const value = options.value;
     const valueSpec = options.valueSpec;

package/validate/validate_object.js

@@ -1,9 +1,16 @@
+// @flow
 
 import ValidationError from '../error/validation_error.js';
 import getType from '../util/get_type.js';
 import validateSpec from './validate.js';
 
-export default function validateObject(options) {
+import type {ValidationOptions} from './validate.js';
+
+type Options = ValidationOptions & {
+    objectElementValidators?: Function;
+};
+
+export default function validateObject(options: Options): Array<ValidationError> {
     const key = options.key;
     const object = options.value;
     const elementSpecs = options.valueSpec || {};
@@ -30,7 +37,9 @@ export default function validateObject(options) {
             validateElement = elementValidators['*'];
         } else if (elementSpecs['*']) {
             validateElement = validateSpec;
-        } else {
+        }
+
+        if (!validateElement) {
             errors.push(new ValidationError(key, object[objectKey], `unknown property "${objectKey}"`));
             continue;
         }
@@ -43,6 +52,7 @@ export default function validateObject(options) {
             styleSpec,
             object,
             objectKey
+        // $FlowFixMe[extra-arg]
         }, object));
     }
 

package/validate/validate_paint_property.js

@@ -1,6 +1,10 @@
+// @flow
 
 import validateProperty from './validate_property.js';
 
-export default function validatePaintProperty(options) {
+import type ValidationError from '../error/validation_error.js';
+import type {PropertyValidationOptions} from './validate_property.js';
+
+export default function validatePaintProperty(options: PropertyValidationOptions): Array<ValidationError> {
     return validateProperty(options, 'paint');
 }

package/validate/validate_projection.js

@@ -1,8 +1,12 @@
+// @flow
+
 import ValidationError from '../error/validation_error.js';
 import getType from '../util/get_type.js';
 import validate from './validate.js';
 
-export default function validateProjection(options) {
+import type {ValidationOptions} from './validate.js';
+
+export default function validateProjection(options: ValidationOptions): Array<ValidationError> {
     const projection = options.value;
     const styleSpec = options.styleSpec;
     const projectionSpec = styleSpec.projection;

package/validate/validate_property.js

@@ -1,3 +1,4 @@
+// @flow
 
 import validate from './validate.js';
 import ValidationError from '../error/validation_error.js';
@@ -6,7 +7,14 @@ import {isFunction} from '../function/index.js';
 import {unbundle, deepUnbundle} from '../util/unbundle_jsonlint.js';
 import {supportsPropertyExpression} from '../util/properties.js';
 
-export default function validateProperty(options, propertyType) {
+import type {ValidationOptions} from './validate.js';
+
+export type PropertyValidationOptions = ValidationOptions & {
+    objectKey: string;
+    layerType: string;
+}
+
+export default function validateProperty(options: PropertyValidationOptions, propertyType: string): Array<ValidationError> {
     const key = options.key;
     const style = options.style;
     const styleSpec = options.styleSpec;

package/validate/validate_source.js

@@ -1,3 +1,4 @@
+// @flow
 
 import ValidationError from '../error/validation_error.js';
 import {unbundle} from '../util/unbundle_jsonlint.js';
@@ -7,11 +8,13 @@ import validateExpression from './validate_expression.js';
 import validateString from './validate_string.js';
 import getType from '../util/get_type.js';
 
+import type {ValidationOptions} from './validate.js';
+
 const objectElementValidators = {
     promoteId: validatePromoteId
 };
 
-export default function validateSource(options) {
+export default function validateSource(options: ValidationOptions): Array<ValidationError> {
     const value = options.value;
     const key = options.key;
     const styleSpec = options.styleSpec;

package/validate/validate_string.js

@@ -1,8 +1,11 @@
+// @flow
 
 import getType from '../util/get_type.js';
 import ValidationError from '../error/validation_error.js';
 
-export default function validateString(options) {
+import type {ValidationOptions} from './validate.js';
+
+export default function validateString(options: $Shape<ValidationOptions>): Array<ValidationError> {
     const value = options.value;
     const key = options.key;
     const type = getType(value);

package/validate/validate_terrain.js

@@ -1,10 +1,13 @@
+// @flow
 
 import ValidationError from '../error/validation_error.js';
 import validate from './validate.js';
 import getType from '../util/get_type.js';
 import {unbundle} from '../util/unbundle_jsonlint.js';
 
-export default function validateTerrain(options) {
+import type {ValidationOptions} from './validate.js';
+
+export default function validateTerrain(options: ValidationOptions): Array<ValidationError> {
     const terrain = options.value;
     const key = options.key;
     const style = options.style;
@@ -52,7 +55,7 @@ export default function validateTerrain(options) {
         if (!source) {
             errors.push(new ValidationError(key, terrain.source, `source "${terrain.source}" not found`));
         } else if (sourceType !== 'raster-dem') {
-            errors.push(new ValidationError(key, terrain.source, `terrain cannot be used with a source of type ${sourceType}, it only be used with a "raster-dem" source type`));
+            errors.push(new ValidationError(key, terrain.source, `terrain cannot be used with a source of type ${String(sourceType)}, it only be used with a "raster-dem" source type`));
         }
     }
 

package/validate_style.min.js

@@ -63,5 +63,5 @@ export const validatePaintProperty: Validator = opts => sortErrors(_validatePain
 export const validateLayoutProperty: Validator = opts => sortErrors(_validateLayoutProperty(opts));
 
 function sortErrors(errors) {
-    return errors.slice().sort((a, b) => a.line - b.line);
+    return errors.slice().sort((a, b) => a.line && b.line ? a.line - b.line : 0);
 }