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

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