@mapbox/mapbox-gl-style-spec 13.28.0 → 14.0.0-beta.2

package/validate_style.min.js

@@ -1,23 +1,24 @@
 // @flow
-import validate from './validate/validate.js';
 import latestStyleSpec from './reference/latest.js';
-import validateGlyphsURL from './validate/validate_glyphs_url.js';
 
+import _validateStyle from './validate/validate_style.js';
 import _validateSource from './validate/validate_source.js';
 import _validateLight from './validate/validate_light.js';
+import _validateLights from './validate/validate_lights.js';
 import _validateTerrain from './validate/validate_terrain.js';
 import _validateFog from './validate/validate_fog.js';
 import _validateLayer from './validate/validate_layer.js';
 import _validateFilter from './validate/validate_filter.js';
 import _validatePaintProperty from './validate/validate_paint_property.js';
 import _validateLayoutProperty from './validate/validate_layout_property.js';
+import _validateModel from './validate/validate_model.js';
 
 import type {StyleSpecification} from './types.js';
 
-export type ValidationError = {
-    message: string;
-    identifier?: ?string;
-    line?: ?number;
+export type ValidationError = interface {
+    message: string,
+    identifier?: ?string,
+    line?: ?number,
 };
 export type ValidationErrors = $ReadOnlyArray<ValidationError>;
 export type Validator = (Object) => ValidationErrors;
@@ -38,30 +39,21 @@ export type Validator = (Object) => ValidationErrors;
  *   var errors = validate(style);
  */
 export function validateStyle(style: StyleSpecification, styleSpec: Object = latestStyleSpec): ValidationErrors {
-
-    const errors = validate({
-        key: '',
-        value: style,
-        valueSpec: styleSpec.$root,
-        styleSpec,
-        style,
-        objectElementValidators: {
-            glyphs: validateGlyphsURL,
-            '*': () => []
-        }
-    });
+    const errors = _validateStyle(style, styleSpec);
     return sortErrors(errors);
 }
 
 export const validateSource: Validator = opts => sortErrors(_validateSource(opts));
 export const validateLight: Validator = opts => sortErrors(_validateLight(opts));
+export const validateLights: Validator = opts => sortErrors(_validateLights(opts));
 export const validateTerrain: Validator = opts => sortErrors(_validateTerrain(opts));
 export const validateFog: Validator = opts => sortErrors(_validateFog(opts));
 export const validateLayer: Validator = opts => sortErrors(_validateLayer(opts));
 export const validateFilter: Validator = opts => sortErrors(_validateFilter(opts));
 export const validatePaintProperty: Validator = opts => sortErrors(_validatePaintProperty(opts));
 export const validateLayoutProperty: Validator = opts => sortErrors(_validateLayoutProperty(opts));
+export const validateModel: Validator = opts => sortErrors(_validateModel(opts));
 
-function sortErrors(errors) {
+function sortErrors(errors: ValidationErrors) {
     return errors.slice().sort((a, b) => a.line && b.line ? a.line - b.line : 0);
 }

package/visit.js

@@ -10,7 +10,7 @@ import type {
     DataDrivenPropertyValueSpecification
 } from './types.js';
 
-function getPropertyReference(propertyName): StylePropertySpecification {
+function getPropertyReference(propertyName: string): StylePropertySpecification {
     for (let i = 0; i < Reference.layout.length; i++) {
         for (const key in Reference[Reference.layout[i]]) {
             if (key === propertyName) return (Reference[Reference.layout[i]][key]: any);
@@ -50,7 +50,8 @@ export function eachProperty(
     options: {paint?: boolean, layout?: boolean},
     callback: PropertyCallback
 ) {
-    function inner(layer, propertyType: 'paint' | 'layout') {
+    function inner(layer: LayerSpecification, propertyType: 'paint' | 'layout') {
+        if (layer.type === 'slot') return;
         const properties = (layer[propertyType]: any);
         if (!properties) return;
         Object.keys(properties).forEach((key) => {