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

package/empty.js

@@ -1,29 +1,10 @@
-import latest from './reference/latest.js';
-
-export default function emptyStyle() {
-    const style = {};
-
-    const version = latest['$version'];
-    for (const styleKey in latest['$root']) {
-        const spec = latest['$root'][styleKey];
-
-        if (spec.required) {
-            let value = null;
-            if (styleKey === 'version') {
-                value = version;
-            } else {
-                if (spec.type === 'array') {
-                    value = [];
-                } else {
-                    value = {};
-                }
-            }
-
-            if (value != null) {
-                style[styleKey] = value;
-            }
-        }
-    }
-
-    return style;
+// @flow
+import type {StyleSpecification} from './types.js';
+
+export default function emptyStyle(): StyleSpecification {
+    return {
+        version: 8,
+        layers: [],
+        sources: {}
+    };
 }

package/expression/definitions/in.js

@@ -42,7 +42,7 @@ class In implements Expression {
         const needle = (this.needle.evaluate(ctx): any);
         const haystack = (this.haystack.evaluate(ctx): any);
 
-        if (!haystack) return false;
+        if (haystack == null) return false;
 
         if (!isValidNativeType(needle, ['boolean', 'string', 'number', 'null'])) {
             throw new RuntimeError(`Expected first argument to be of type boolean, string, number or null, but found ${toString(typeOf(needle))} instead.`);

package/feature_filter/index.js

@@ -9,7 +9,7 @@ import type {CanonicalTileID} from '../../source/tile_id.js';
 import type Point from '@mapbox/point-geometry';
 
 export type FeatureDistanceData = {bearing: [number, number], center: [number, number], scale: number};
-type FilterExpression = (globalProperties: GlobalProperties, feature: Feature, canonical?: CanonicalTileID, featureTileCoord?: Point, featureDistanceData?: FeatureDistanceData) => boolean;
+export type FilterExpression = (globalProperties: GlobalProperties, feature: Feature, canonical?: CanonicalTileID, featureTileCoord?: Point, featureDistanceData?: FeatureDistanceData) => boolean;
 export type FeatureFilter = {filter: FilterExpression, dynamicFilter?: FilterExpression, needGeometry: boolean, needFeature: boolean};
 
 export default createFilter;

package/flow-typed/gl-matrix.js

@@ -38,6 +38,7 @@ declare module "gl-matrix" {
         div<T: Vec3>(T, Vec3, Vec3): T,
         min<T: Vec3>(T, Vec3, Vec3): T,
         max<T: Vec3>(T, Vec3, Vec3): T,
+        lerp<T: Vec3>(T, Vec3, Vec3, number): T,
         transformQuat<T: Vec3>(T, Vec3, Quat): T,
         transformMat3<T: Vec3>(T, Vec3, Mat3): T,
         transformMat4<T: Vec3>(T, Vec3, Mat4): T

package/group_by_layout.js

@@ -1,9 +1,11 @@
+// @flow
+
+import type {LayerSpecification} from './types.js';
 
 import refProperties from './util/ref_properties.js';
 
 function stringify(obj) {
-    const type = typeof obj;
-    if (type === 'number' || type === 'boolean' || type === 'string' || obj === undefined || obj === null)
+    if (typeof obj === 'number' || typeof obj === 'boolean' || typeof obj === 'string' || obj === undefined || obj === null)
         return JSON.stringify(obj);
 
     if (Array.isArray(obj)) {
@@ -14,11 +16,9 @@ function stringify(obj) {
         return `${str}]`;
     }
 
-    const keys = Object.keys(obj).sort();
-
     let str = '{';
-    for (let i = 0; i < keys.length; i++) {
-        str += `${JSON.stringify(keys[i])}:${stringify(obj[keys[i]])},`;
+    for (const key of Object.keys(obj).sort()) {
+        str += `${key}:${stringify((obj: any)[key])},`;
     }
     return `${str}}`;
 }
@@ -26,13 +26,11 @@ function stringify(obj) {
 function getKey(layer) {
     let key = '';
     for (const k of refProperties) {
-        key += `/${stringify(layer[k])}`;
+        key += `/${stringify((layer: any)[k])}`;
     }
     return key;
 }
 
-export default groupByLayout;
-
 /**
  * Given an array of layers, return an array of arrays of layers where all
  * layers in each group have identical layout-affecting properties. These
@@ -48,7 +46,7 @@ export default groupByLayout;
  * @param {Object} [cachedKeys] - an object to keep already calculated keys.
  * @returns {Array<Array<Layer>>}
  */
-function groupByLayout(layers, cachedKeys) {
+export default function groupByLayout(layers: Array<LayerSpecification>, cachedKeys: {[id: string]: string}): Array<Array<LayerSpecification>> {
     const groups = {};
 
     for (let i = 0; i < layers.length; i++) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mapbox/mapbox-gl-style-spec",
   "description": "a specification for mapbox gl styles",
-  "version": "13.24.0-alpha.3",
+  "version": "13.24.0-alpha.6",
   "author": "Mapbox",
   "keywords": [
     "mapbox",
@@ -22,9 +22,11 @@
     }
   },
   "scripts": {
+    "pretest": "npm run build",
+    "test": "node ./test.js",
     "copy-flow-typed": "cp -R ../../flow-typed .",
     "build": "../../node_modules/.bin/rollup -c && ../../node_modules/.bin/rollup -c --environment esm",
-    "prepublishOnly": "git clean -fdx && yarn copy-flow-typed && yarn build",
+    "prepublishOnly": "npm run copy-flow-typed && npm run build",
     "postpublish": "rm -r flow-typed dist/index.cjs"
   },
   "repository": {
@@ -32,15 +34,15 @@
     "url": "git@github.com:mapbox/mapbox-gl-js.git"
   },
   "bin": {
-    "gl-style-migrate": "bin/gl-style-migrate",
-    "gl-style-validate": "bin/gl-style-validate",
-    "gl-style-format": "bin/gl-style-format",
-    "gl-style-composite": "bin/gl-style-composite"
+    "gl-style-migrate": "./bin/gl-style-migrate.js",
+    "gl-style-validate": "./bin/gl-style-validate.js",
+    "gl-style-format": "./bin/gl-style-format.js",
+    "gl-style-composite": "./bin/gl-style-composite.js"
   },
   "dependencies": {
     "@mapbox/jsonlint-lines-primitives": "~2.0.2",
-    "@mapbox/unitbezier": "^0.0.0",
     "@mapbox/point-geometry": "^0.1.0",
+    "@mapbox/unitbezier": "^0.0.0",
     "csscolorparser": "~1.0.2",
     "json-stringify-pretty-compact": "^2.0.0",
     "minimist": "^1.2.5",

package/style-spec.js

@@ -125,6 +125,3 @@ export {
     validateMapboxApiSupported,
     visit
 };
-
-validate.parsed = validate;
-validate.latest = validate;

package/test.js

@@ -0,0 +1,31 @@
+#!/usr/bin/env node
+/* eslint-disable no-process-exit */
+
+import fs from 'fs';
+import {execSync} from 'child_process';
+import {createRequire} from 'module';
+
+const packageJson = JSON.parse(fs.readFileSync('./package.json'));
+
+process.on('unhandledRejection', error => {
+    // don't log `error` directly, because errors from child_process.execSync
+    // contain an (undocumented) `envPairs` with environment variable values
+    console.log(error.message || 'unhandledRejection');
+    process.exit(1);
+});
+
+const require = createRequire(import.meta.url);
+const stylePath = require.resolve('mapbox-gl-styles/styles/basic-v9.json');
+
+try {
+    for (const bin in packageJson.bin) {
+        const script = packageJson.bin[bin];
+        const command = [script, stylePath].join(' ');
+
+        console.log(command);
+        execSync(command).toString();
+    }
+} catch (error) {
+    console.log(error.message);
+    process.exit(1);
+}

package/util/color_spaces.js

@@ -79,7 +79,7 @@ function labToRgb(labColor: LABColor): Color {
     );
 }
 
-function interpolateLab(from: LABColor, to: LABColor, t: number) {
+function interpolateLab(from: LABColor, to: LABColor, t: number): LABColor {
     return {
         l: interpolateNumber(from.l, to.l, t),
         a: interpolateNumber(from.a, to.a, t),
@@ -117,7 +117,7 @@ function interpolateHue(a: number, b: number, t: number) {
     return a + t * (d > 180 || d < -180 ? d - 360 * Math.round(d / 360) : d);
 }
 
-function interpolateHcl(from: HCLColor, to: HCLColor, t: number) {
+function interpolateHcl(from: HCLColor, to: HCLColor, t: number): HCLColor {
     return {
         h: interpolateHue(from.h, to.h, t),
         c: interpolateNumber(from.c, to.c, t),

package/util/extend.js

@@ -1,6 +1,6 @@
 // @flow
 
-export default function (output: any, ...inputs: Array<any>) {
+export default function (output: any, ...inputs: Array<any>): any {
     for (const input of inputs) {
         for (const k in input) {
             output[k] = input[k];

package/util/interpolate.js

@@ -2,11 +2,11 @@
 
 import Color from './color.js';
 
-export function number(a: number, b: number, t: number) {
+export function number(a: number, b: number, t: number): number {
     return (a * (1 - t)) + (b * t);
 }
 
-export function color(from: Color, to: Color, t: number) {
+export function color(from: Color, to: Color, t: number): Color {
     return new Color(
         number(from.r, to.r, t),
         number(from.g, to.g, t),

package/util/ref_properties.js

@@ -1,2 +1,2 @@
-
+// @flow
 export default ['type', 'source', 'source-layer', 'minzoom', 'maxzoom', 'filter', 'layout'];

package/util/unbundle_jsonlint.js

@@ -1,7 +1,7 @@
 // @flow
 
 // Turn jsonlint-lines-primitives objects into primitive objects
-export function unbundle(value: mixed) {
+export function unbundle(value: mixed): mixed {
     if (value instanceof Number || value instanceof String || value instanceof Boolean) {
         return value.valueOf();
     } else {

package/validate/validate.js

@@ -11,7 +11,6 @@ import validateArray from './validate_array.js';
 import validateBoolean from './validate_boolean.js';
 import validateNumber from './validate_number.js';
 import validateColor from './validate_color.js';
-import validateConstants from './validate_constants.js';
 import validateEnum from './validate_enum.js';
 import validateFilter from './validate_filter.js';
 import validateLayer from './validate_layer.js';
@@ -32,7 +31,6 @@ const VALIDATORS = {
     'boolean': validateBoolean,
     'number': validateNumber,
     'color': validateColor,
-    'constants': validateConstants,
     'enum': validateEnum,
     'filter': validateFilter,
     'function': validateFunction,

package/validate_mapbox_api_supported.js

@@ -1,11 +1,13 @@
 // @flow
 
-import validateStyle from './validate_style.min.js';
+import {validateStyle} from './validate_style.min.js';
 import {v8} from './style-spec.js';
 import readStyle from './read_style.js';
 import ValidationError from './error/validation_error.js';
 import getType from './util/get_type.js';
 
+import type {ValidationErrors} from './validate_style.min.js';
+
 const SUPPORTED_SPEC_VERSION = 8;
 const MAX_SOURCES_IN_STYLE = 15;
 
@@ -22,7 +24,7 @@ function getSourceCount(source: Object): number {
     }
 }
 
-function getAllowedKeyErrors(obj: Object, keys: Array<*>, path: ?string): Array<?ValidationError> {
+function getAllowedKeyErrors(obj: Object, keys: Array<*>, path: ?string): Array<ValidationError> {
     const allowed = new Set(keys);
     const errors = [];
     Object.keys(obj).forEach(k => {
@@ -35,7 +37,7 @@ function getAllowedKeyErrors(obj: Object, keys: Array<*>, path: ?string): Array<
 }
 
 const acceptedSourceTypes = new Set(["vector", "raster", "raster-dem"]);
-function getSourceErrors(source: Object, i: number): Array<?ValidationError> {
+function getSourceErrors(source: Object, i: number): Array<ValidationError> {
     const errors = [];
 
     /*
@@ -66,7 +68,7 @@ function getSourceErrors(source: Object, i: number): Array<?ValidationError> {
     return errors;
 }
 
-function getSourcesErrors(sources: Object): Array<?ValidationError> {
+function getSourcesErrors(sources: Object): Array<ValidationError> {
     const errors = [];
     let count = 0;
 
@@ -88,7 +90,7 @@ function getSourcesErrors(sources: Object): Array<?ValidationError> {
     return errors;
 }
 
-function getRootErrors(style: Object, specKeys: Array<any>): Array<?ValidationError> {
+function getRootErrors(style: Object, specKeys: Array<any>): Array<ValidationError> {
     const errors = [];
 
     /*
@@ -165,7 +167,7 @@ function getRootErrors(style: Object, specKeys: Array<any>): Array<?ValidationEr
  *   var validateMapboxApiSupported = require('mapbox-gl-style-spec/lib/validate_style_mapbox_api_supported.js');
  *   var errors = validateMapboxApiSupported(style);
  */
-export default function validateMapboxApiSupported(style: Object): Array<?ValidationError> {
+export default function validateMapboxApiSupported(style: Object): ValidationErrors {
     let s = style;
     try {
         s = readStyle(s);

package/validate_style.js

@@ -1,8 +1,11 @@
-
-import validateStyleMin from './validate_style.min.js';
+// @flow
+import {validateStyle as validateStyleMin} from './validate_style.min.js';
 import {v8} from './style-spec.js';
 import readStyle from './read_style.js';
 
+import type {ValidationErrors} from './validate_style.min.js';
+import type {StyleSpecification} from './types.js';
+
 /**
  * Validate a Mapbox GL style against the style specification.
  *
@@ -19,7 +22,7 @@ import readStyle from './read_style.js';
  *   var errors = validate(style);
  */
 
-export default function validateStyle(style, styleSpec = v8) {
+export default function validateStyle(style: StyleSpecification | string | Buffer, styleSpec: Object = v8): ValidationErrors {
     let s = style;
 
     try {
@@ -31,9 +34,11 @@ export default function validateStyle(style, styleSpec = v8) {
     return validateStyleMin(s, styleSpec);
 }
 
-export const source = validateStyleMin.source;
-export const light = validateStyleMin.light;
-export const layer = validateStyleMin.layer;
-export const filter = validateStyleMin.filter;
-export const paintProperty = validateStyleMin.paintProperty;
-export const layoutProperty = validateStyleMin.layoutProperty;
+export {
+    validateSource as source,
+    validateLight as light,
+    validateLayer as layer,
+    validateFilter as filter,
+    validatePaintProperty as paintProperty,
+    validateLayoutProperty as layoutProperty
+} from './validate_style.min.js';

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 [];
-    }
-}