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

package/bin/gl-style-composite.js

@@ -0,0 +1,21 @@
+#!/usr/bin/env node
+/* eslint-disable no-process-exit */
+/* eslint import/no-unresolved: [error, { ignore: ['^@mapbox/mapbox-gl-style-spec$'] }] */
+
+import fs from 'fs';
+import minimist from 'minimist';
+import {format, composite} from '@mapbox/mapbox-gl-style-spec';
+
+const argv = minimist(process.argv.slice(2));
+
+if (argv.help || argv.h || (!argv._.length && process.stdin.isTTY)) {
+    help();
+    process.exit(0);
+}
+
+console.log(format(composite(JSON.parse(fs.readFileSync(argv._[0])))));
+
+function help() {
+    console.log('usage:');
+    console.log('  gl-style-composite style.json');
+}

package/bin/{gl-style-format → gl-style-format.js}

@@ -1,12 +1,16 @@
 #!/usr/bin/env node
+/* eslint-disable no-process-exit */
+/* eslint import/no-unresolved: [error, { ignore: ['^@mapbox/mapbox-gl-style-spec$'] }] */
 
+import fs from 'fs';
+import minimist from 'minimist';
+import {format} from '@mapbox/mapbox-gl-style-spec';
 
-var fs = require('fs'),
-    argv = require('minimist')(process.argv.slice(2)),
-    format = require('../').format;
+const argv = minimist(process.argv.slice(2));
 
 if (argv.help || argv.h || (!argv._.length && process.stdin.isTTY)) {
-    return help();
+    help();
+    process.exit(0);
 }
 
 console.log(format(JSON.parse(fs.readFileSync(argv._[0])), argv.space));

package/bin/gl-style-migrate.js

@@ -0,0 +1,21 @@
+#!/usr/bin/env node
+/* eslint-disable no-process-exit */
+/* eslint import/no-unresolved: [error, { ignore: ['^@mapbox/mapbox-gl-style-spec$'] }] */
+
+import fs from 'fs';
+import minimist from 'minimist';
+import {format, migrate} from '@mapbox/mapbox-gl-style-spec';
+
+const argv = minimist(process.argv.slice(2));
+
+if (argv.help || argv.h || (!argv._.length && process.stdin.isTTY)) {
+    help();
+    process.exit(0);
+}
+
+console.log(format(migrate(JSON.parse(fs.readFileSync(argv._[0])))));
+
+function help() {
+    console.log('usage:');
+    console.log('  gl-style-migrate source.json > destination.json');
+}

package/bin/{gl-style-validate → gl-style-validate.js}

@@ -1,25 +1,28 @@
 #!/usr/bin/env node
+/* eslint-disable no-process-exit */
+/* eslint import/no-unresolved: [error, { ignore: ['^@mapbox/mapbox-gl-style-spec$'] }] */
 
+import rw from 'rw';
+import minimist from 'minimist';
+import {validate, validateMapboxApiSupported} from '@mapbox/mapbox-gl-style-spec';
 
-var argv = require('minimist')(process.argv.slice(2), {
-        boolean: 'json',
-        boolean: 'mapbox-api-supported'
-    }),
-    validate = require('../').validate,
-    validateMapboxApiSupported = require('../').validateMapboxApiSupported
-    rw = require('rw'),
-    status = 0;
+const argv = minimist(process.argv.slice(2), {
+    boolean: ['json', 'mapbox-api-supported'],
+});
+
+let status = 0;
 
 if (argv.help || argv.h || (!argv._.length && process.stdin.isTTY)) {
-    return help();
+    help();
+    process.exit(status);
 }
 
 if (!argv._.length) {
     argv._.push('/dev/stdin');
 }
 
-argv._.forEach(function(file) {
-    var errors;
+argv._.forEach((file) => {
+    let errors = [];
     if (argv['mapbox-api-supported']) {
         errors = validateMapboxApiSupported(rw.readFileSync(file, 'utf8'));
     } else {
@@ -29,7 +32,7 @@ argv._.forEach(function(file) {
         if (argv.json) {
             process.stdout.write(JSON.stringify(errors, null, 2));
         } else {
-            errors.forEach(function (e) {
+            errors.forEach((e) => {
                 console.log('%s:%d: %s', file, e.line, e.message);
             });
         }

package/deref.js

@@ -1,7 +1,10 @@
+// @flow
 
 import refProperties from './util/ref_properties.js';
 
-function deref(layer, parent) {
+import type {LayerSpecification} from './types.js';
+
+function deref(layer: LayerSpecification, parent: LayerSpecification): LayerSpecification {
     const result = {};
 
     for (const k in layer) {
@@ -12,15 +15,13 @@ function deref(layer, parent) {
 
     refProperties.forEach((k) => {
         if (k in parent) {
-            result[k] = parent[k];
+            result[k] = (parent: any)[k];
         }
     });
 
-    return result;
+    return ((result: any): LayerSpecification);
 }
 
-export default derefLayers;
-
 /**
  * Given an array of layers, some of which may contain `ref` properties
  * whose value is the `id` of another property, return a new array where
@@ -34,7 +35,7 @@ export default derefLayers;
  * @param {Array<Layer>} layers
  * @returns {Array<Layer>}
  */
-function derefLayers(layers) {
+export default function derefLayers(layers: Array<LayerSpecification>): Array<LayerSpecification> {
     layers = layers.slice();
 
     const map = Object.create(null);
@@ -44,7 +45,7 @@ function derefLayers(layers) {
 
     for (let i = 0; i < layers.length; i++) {
         if ('ref' in layers[i]) {
-            layers[i] = deref(layers[i], map[layers[i].ref]);
+            layers[i] = deref(layers[i], map[(layers[i]: any).ref]);
         }
     }
 

package/diff.js

@@ -1,7 +1,15 @@
+// @flow
 
 import isEqual from './util/deep_equal.js';
 
-const operations = {
+import type {StyleSpecification} from './types.js';
+
+type Command = {
+    command: string;
+    args: Array<any>;
+};
+
+export const operations: {[_: string]: string} = {
 
     /*
      * { command: 'setStyle', args: [stylesheet] }
@@ -330,7 +338,7 @@ function diffLayers(before, after, commands) {
  * @param {*} after stylesheet to compare to
  * @returns Array list of changes
  */
-function diffStyles(before, after) {
+export default function diffStyles(before: StyleSpecification, after: StyleSpecification): Array<Command> {
     if (!before) return [{command: operations.setStyle, args: [after]}];
 
     let commands = [];
@@ -388,7 +396,7 @@ function diffStyles(before, after) {
         const beforeLayers = [];
         if (before.layers) {
             before.layers.forEach((layer) => {
-                if (sourcesRemoved[layer.source]) {
+                if (layer.source && sourcesRemoved[layer.source]) {
                     commands.push({command: operations.removeLayer, args: [layer.id]});
                 } else {
                     beforeLayers.push(layer);
@@ -424,6 +432,3 @@ function diffStyles(before, after) {
 
     return commands;
 }
-
-export default diffStyles;
-export {operations};

package/dist/index.cjs

@@ -10686,7 +10686,7 @@
       evaluate(ctx) {
           const needle = this.needle.evaluate(ctx);
           const haystack = this.haystack.evaluate(ctx);
-          if (!haystack)
+          if (haystack == null)
               return false;
           if (!isValidNativeType(needle, [
                   'boolean',
@@ -13619,7 +13619,7 @@ ${ JSON.stringify(filterExp, null, 2) }
           const beforeLayers = [];
           if (before.layers) {
               before.layers.forEach(layer => {
-                  if (sourcesRemoved[layer.source]) {
+                  if (layer.source && sourcesRemoved[layer.source]) {
                       commands.push({
                           command: operations.removeLayer,
                           args: [layer.id]
@@ -13677,16 +13677,6 @@ ${ JSON.stringify(filterExp, null, 2) }
       }
   }
 
-  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 [];
-      }
-  }
-
   function validateObject(options) {
       const key = options.key;
       const object = options.value;
@@ -14642,7 +14632,6 @@ ${ JSON.stringify(filterExp, null, 2) }
       'boolean': validateBoolean,
       'number': validateNumber,
       'color': validateColor,
-      'constants': validateConstants,
       'enum': validateEnum,
       'filter': validateFilter,
       'function': validateFunction,
@@ -14688,9 +14677,8 @@ ${ JSON.stringify(filterExp, null, 2) }
       return errors;
   }
 
-  function validateStyleMin(style, styleSpec = v8) {
-      let errors = [];
-      errors = errors.concat(validate({
+  function validateStyle(style, styleSpec = v8) {
+      const errors = validate({
           key: '',
           value: style,
           valueSpec: styleSpec.$root,
@@ -14698,38 +14686,13 @@ ${ JSON.stringify(filterExp, null, 2) }
           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);
   function sortErrors(errors) {
-      return [].concat(errors).sort((a, b) => {
-          return a.line - b.line;
-      });
-  }
-  function wrapCleanErrors(inner) {
-      return function (...args) {
-          return sortErrors(inner.apply(this, args));
-      };
+      return errors.slice().sort((a, b) => a.line - b.line);
   }
 
   /* parser generated by jison 0.4.15 */
@@ -15402,14 +15365,14 @@ ${ JSON.stringify(filterExp, null, 2) }
       return style;
   }
 
-  function validateStyle(style, styleSpec = v8) {
+  function validateStyle$1(style, styleSpec = v8) {
       let s = style;
       try {
           s = readStyle(s);
       } catch (e) {
           return [e];
       }
-      return validateStyleMin(s, styleSpec);
+      return validateStyle(s, styleSpec);
   }
 
   const SUPPORTED_SPEC_VERSION = 8;
@@ -15518,7 +15481,7 @@ ${ JSON.stringify(filterExp, null, 2) }
       } catch (e) {
           return [e];
       }
-      let errors = validateStyleMin(s, v8).concat(getRootErrors(s, Object.keys(v8.$root)));
+      let errors = validateStyle(s, v8).concat(getRootErrors(s, Object.keys(v8.$root)));
       if (s.sources) {
           errors = errors.concat(getSourcesErrors(s.sources));
       }
@@ -15546,8 +15509,6 @@ ${ JSON.stringify(filterExp, null, 2) }
       eachLayer,
       eachProperty
   };
-  validateStyle.parsed = validateStyle;
-  validateStyle.latest = validateStyle;
 
   exports.Color = Color;
   exports.ParsingError = ParsingError$1;
@@ -15563,7 +15524,7 @@ ${ JSON.stringify(filterExp, null, 2) }
   exports.latest = v8;
   exports.migrate = migrate;
   exports.v8 = v8;
-  exports.validate = validateStyle;
+  exports.validate = validateStyle$1;
   exports.validateMapboxApiSupported = validateMapboxApiSupported;
   exports.visit = visit;