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

package/validate_style.min.js

@@ -1,17 +1,26 @@
-
-import validateConstants from './validate/validate_constants.js';
+// @flow
 import validate from './validate/validate.js';
 import latestStyleSpec from './reference/latest.js';
 import validateGlyphsURL from './validate/validate_glyphs_url.js';
 
-import validateSource from './validate/validate_source.js';
-import validateLight from './validate/validate_light.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 _validateSource from './validate/validate_source.js';
+import _validateLight from './validate/validate_light.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 type {StyleSpecification} from './types.js';
+
+export type ValidationError = {
+    message: string;
+    identifier?: ?string;
+    line?: ?number;
+};
+export type ValidationErrors = $ReadOnlyArray<ValidationError>;
+export type Validator = (Object) => ValidationErrors;
 
 /**
  * Validate a Mapbox GL style against the style specification. This entrypoint,
@@ -28,11 +37,9 @@ import validateLayoutProperty from './validate/validate_layout_property.js';
  *   var validate = require('mapbox-gl-style-spec/lib/validate_style.min');
  *   var errors = validate(style);
  */
-function validateStyleMin(style, styleSpec = latestStyleSpec) {
+export function validateStyle(style: StyleSpecification, styleSpec: Object = latestStyleSpec): ValidationErrors {
 
-    let errors = [];
-
-    errors = errors.concat(validate({
+    const errors = validate({
         key: '',
         value: style,
         valueSpec: styleSpec.$root,
@@ -40,43 +47,21 @@ function validateStyleMin(style, styleSpec = latestStyleSpec) {
         style,
         objectElementValidators: {
             glyphs: validateGlyphsURL,
-            '*'() {
-                return [];
-            }
+            '*': () => []
         }
-    }));
-
-    if (style.constants) {
-        errors = errors.concat(validateConstants({
-            key: 'constants',
-            value: style.constants,
-            style,
-            styleSpec
-        }));
-    }
-
+    });
     return sortErrors(errors);
 }
 
-validateStyleMin.source = wrapCleanErrors(validateSource);
-validateStyleMin.light = wrapCleanErrors(validateLight);
-validateStyleMin.terrain = wrapCleanErrors(validateTerrain);
-validateStyleMin.fog = wrapCleanErrors(validateFog);
-validateStyleMin.layer = wrapCleanErrors(validateLayer);
-validateStyleMin.filter = wrapCleanErrors(validateFilter);
-validateStyleMin.paintProperty = wrapCleanErrors(validatePaintProperty);
-validateStyleMin.layoutProperty = wrapCleanErrors(validateLayoutProperty);
+export const validateSource: Validator = opts => sortErrors(_validateSource(opts));
+export const validateLight: Validator = opts => sortErrors(_validateLight(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));
 
 function sortErrors(errors) {
-    return [].concat(errors).sort((a, b) => {
-        return a.line - b.line;
-    });
+    return errors.slice().sort((a, b) => a.line - b.line);
 }
-
-function wrapCleanErrors(inner) {
-    return function(...args) {
-        return sortErrors(inner.apply(this, args));
-    };
-}
-
-export default validateStyleMin;

package/bin/gl-style-composite

@@ -1,9 +0,0 @@
-#!/usr/bin/env node
-
-
-var fs = require('fs'),
-    argv = require('minimist')(process.argv.slice(2)),
-    format = require('../').format,
-    composite = require('../').composite;
-
-console.log(format(composite(JSON.parse(fs.readFileSync(argv._[0])))));

package/bin/gl-style-migrate

@@ -1,9 +0,0 @@
-#!/usr/bin/env node
-
-
-var fs = require('fs'),
-    argv = require('minimist')(process.argv.slice(2)),
-    format = require('../').format,
-    migrate = require('../').migrate;
-
-console.log(format(migrate(JSON.parse(fs.readFileSync(argv._[0])))));

package/declass.js

@@ -1,42 +0,0 @@
-
-import extend from './util/extend.js';
-
-export default declassStyle;
-
-/**
- * Returns a new style with the given 'paint classes' merged into each layer's
- * main `paint` definiton, and with all `paint.*` properties removed.
- *
- * @private
- * @param {Object} style A style JSON object.
- * @param {Array<string>} classes An array of paint classes to apply, in order.
- *
- * @example
- * var declass = require('mapbox-gl-style-spec/lib/declass')
- * var baseStyle = { ... style with a 'paint.night' property in some layers ... }
- * var nightStyle = declass(baseStyle, ['night'])
- * // nightStyle now has each layer's `paint.night` properties merged in to the
- * // main `paint` property.
- */
-function declassStyle(style, classes) {
-    return extend({}, style, {
-        layers: style.layers.map((layer) => {
-            const result = classes.reduce(declassLayer, layer);
-
-            // strip away all `paint.CLASS` definitions
-            for (const key in result) {
-                if (/paint\..*/.test(key)) {
-                    delete result[key];
-                }
-            }
-
-            return result;
-        })
-    });
-}
-
-function declassLayer(layer, klass) {
-    return extend({}, layer, {
-        paint: extend({}, layer.paint, layer[`paint.${klass}`])
-    });
-}

package/validate/latest.js

@@ -1,11 +0,0 @@
-
-import validateStyle from '../validate_style.min.js';
-
-/*
- * Validate a style against the latest specification. This method is optimized
- * to keep its bundle size small by refraining from requiring jslint or old
- * style spec versions.
- * @see validateStyleMin
- * @deprecated This file exists for backwards compatibility and will be dropped in the next minor release.
- */
-export default validateStyle;

package/validate/validate_constants.js

@@ -1,13 +0,0 @@
-
-import ValidationError from '../error/validation_error.js';
-
-export default function validateConstants(options) {
-    const key = options.key;
-    const constants = options.value;
-
-    if (constants) {
-        return [new ValidationError(key, constants, 'constants have been deprecated as of v8')];
-    } else {
-        return [];
-    }
-}