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

package/.eslintrc

@@ -0,0 +1,10 @@
+{
+  "overrides": [
+    {
+      "files": ["rollup.config.js", "test.js"],
+      "rules": {
+        "flowtype/require-valid-file-annotation": "off"
+      }
+    }
+  ]
+}

package/CHANGELOG.md

@@ -1,23 +1,29 @@
-# 13.23.1
+## 13.24.0-beta.1
+### 🐞 Bug fixes
+
+* Fix error on `gl-style-validate` script. ([#11538](https://github.com/mapbox/mapbox-gl-js/pull/11538))
+* Allow the second argument to the `in` expression operator to be an empty string. ([#11547](https://github.com/mapbox/mapbox-gl-js/pull/11547))
+* Fix error on some valid `filter` expressions. ([#11475](https://github.com/mapbox/mapbox-gl-js/pull/11475))
 
+## 13.23.1
 ### ✨ Features and improvements
 
 * Improve `coalesce` expressions to return a `ResolvedImage` when images are missing. ([#11371](https://github.com/mapbox/mapbox-gl-js/pull/11371))
 
-# 13.23.0
+## 13.23.0
 
 ### ✨ Features and improvements
 
 * Add a `projection` root property that allows a non-mercator projection to be set as a style's default projection. ([#11124](https://github.com/mapbox/mapbox-gl-js/pull/11124))
 * Add support for using `["pitch"]` and `["distance-from-camera"]` expressions within the `filter` of a symbol layer. ([#10795](https://github.com/mapbox/mapbox-gl-js/pull/10795))
 
-# 13.22.0
+## 13.22.0
 
 ### ✨ Features and improvements
 
 * Added `protected` field to mapbox-api-supported validation. ([#10968](https://github.com/mapbox/mapbox-gl-js/pull/10968))
 
-# 13.21.0
+## 13.21.0
 
 ### ✨ Features and improvements
 * Add support for `text-writing-mode` property when using `symbol-placement: line` text labels. ([#10647](https://github.com/mapbox/mapbox-gl-js/pull/10647))

package/bin/gl-style-composite.js

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

package/bin/gl-style-format.js

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

package/bin/gl-style-migrate.js

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

package/bin/gl-style-validate.js

@@ -1,9 +1,13 @@
 #!/usr/bin/env node
+
+// @flow
 /* eslint-disable no-process-exit */
-/* eslint import/no-unresolved: [error, { ignore: ['^@mapbox/mapbox-gl-style-spec$'] }] */
 
 import rw from 'rw';
 import minimist from 'minimist';
+
+/* eslint import/no-unresolved: [error, { ignore: ['^@mapbox/mapbox-gl-style-spec$'] }] */
+/* $FlowFixMe[cannot-resolve-module] */
 import {validate, validateMapboxApiSupported} from '@mapbox/mapbox-gl-style-spec';
 
 const argv = minimist(process.argv.slice(2), {

package/dist/index.cjs

@@ -101,7 +101,7 @@
   	},
   	projection: {
   		type: "projection",
-  		doc: "The projection the map should be rendered in. Supported projections are Albers, Equal Earth, Equirectangular (WGS84), Lambert conformal conic, Mercator, Natural Earth, Globe, and Winkel Tripel. Terrain, fog, sky and CustomLayerInterface are not supported for projections other than mercator.",
+  		doc: "The projection the map should be rendered in. Supported projections are Albers, Equal Earth, Equirectangular (WGS84), Lambert conformal conic, Mercator, Natural Earth, and Winkel Tripel. Terrain, fog, sky and CustomLayerInterface are not supported for projections other than mercator.",
   		example: {
   			name: "albers",
   			center: [
@@ -3922,9 +3922,6 @@
   			},
   			winkelTripel: {
   				doc: "A Winkel Tripel projection."
-  			},
-  			globe: {
-  				doc: "A globe projection."
   			}
   		},
   		"default": "mercator",
@@ -9278,7 +9275,7 @@
           this.featureDistanceData = null;
       }
       id() {
-          return this.feature && 'id' in this.feature ? this.feature.id : null;
+          return this.feature && 'id' in this.feature && this.feature.id ? this.feature.id : null;
       }
       geometryType() {
           return this.feature ? typeof this.feature.type === 'number' ? geometryTypes[this.feature.type] : this.feature.type : null;
@@ -9631,6 +9628,8 @@
           canonical.y * EXTENT
       ];
       const tilePoints = [];
+      if (!geometry)
+          return tilePoints;
       for (const points of geometry) {
           for (const point of points) {
               const p = [
@@ -9650,6 +9649,8 @@
           canonical.y * EXTENT
       ];
       const tileLines = [];
+      if (!geometry)
+          return tileLines;
       for (const line of geometry) {
           const tileLine = [];
           for (const point of line) {
@@ -9686,6 +9687,9 @@
           -Infinity
       ];
       const canonical = ctx.canonicalID();
+      if (!canonical) {
+          return false;
+      }
       if (polygonGeometry.type === 'Polygon') {
           const tilePolygon = getTilePolygon(polygonGeometry.coordinates, polyBBox, canonical);
           const tilePoints = getTilePoints(ctx.geometry(), pointBBox, polyBBox, canonical);
@@ -9722,6 +9726,9 @@
           -Infinity
       ];
       const canonical = ctx.canonicalID();
+      if (!canonical) {
+          return false;
+      }
       if (polygonGeometry.type === 'Polygon') {
           const tilePolygon = getTilePolygon(polygonGeometry.coordinates, polyBBox, canonical);
           const tileLines = getTileLines(ctx.geometry(), lineBBox, polyBBox, canonical);
@@ -12143,7 +12150,7 @@
           this._evaluator.globals = globals;
           this._evaluator.feature = feature;
           this._evaluator.featureState = featureState;
-          this._evaluator.canonical = canonical;
+          this._evaluator.canonical = canonical || null;
           this._evaluator.availableImages = availableImages || null;
           this._evaluator.formattedSection = formattedSection;
           this._evaluator.featureTileCoord = featureTileCoord || null;
@@ -12154,7 +12161,7 @@
           this._evaluator.globals = globals;
           this._evaluator.feature = feature || null;
           this._evaluator.featureState = featureState || null;
-          this._evaluator.canonical = canonical;
+          this._evaluator.canonical = canonical || null;
           this._evaluator.availableImages = availableImages || null;
           this._evaluator.formattedSection = formattedSection || null;
           this._evaluator.featureTileCoord = featureTileCoord || null;
@@ -13701,7 +13708,8 @@ ${ JSON.stringify(filterExp, null, 2) }
               validateElement = elementValidators['*'];
           } else if (elementSpecs['*']) {
               validateElement = validate;
-          } else {
+          }
+          if (!validateElement) {
               errors.push(new ValidationError(key, object[objectKey], `unknown property "${ objectKey }"`));
               continue;
           }
@@ -13746,7 +13754,8 @@ ${ JSON.stringify(filterExp, null, 2) }
           'type': arraySpec.value,
           'values': arraySpec.values,
           'minimum': arraySpec.minimum,
-          'maximum': arraySpec.maximum
+          'maximum': arraySpec.maximum,
+          function: undefined
       };
       if (styleSpec.$version < 7) {
           arrayElementSpec.function = arraySpec.function;
@@ -13883,11 +13892,15 @@ ${ JSON.stringify(filterExp, null, 2) }
               if (value[0].value === undefined) {
                   return [new ValidationError(key, value, 'object stop key must have value')];
               }
-              if (previousStopDomainZoom && previousStopDomainZoom > unbundle(value[0].zoom)) {
+              const nextStopDomainZoom = unbundle(value[0].zoom);
+              if (typeof nextStopDomainZoom !== 'number') {
+                  return [new ValidationError(key, value[0].zoom, 'stop zoom values must be numbers')];
+              }
+              if (previousStopDomainZoom && previousStopDomainZoom > nextStopDomainZoom) {
                   return [new ValidationError(key, value[0].zoom, 'stop zoom values must appear in ascending order')];
               }
-              if (unbundle(value[0].zoom) !== previousStopDomainZoom) {
-                  previousStopDomainZoom = unbundle(value[0].zoom);
+              if (nextStopDomainZoom !== previousStopDomainZoom) {
+                  previousStopDomainZoom = nextStopDomainZoom;
                   previousStopDomainValue = undefined;
                   stopDomainValues = {};
               }
@@ -13931,7 +13944,7 @@ ${ JSON.stringify(filterExp, null, 2) }
           } else if (type !== stopKeyType) {
               return [new ValidationError(options.key, reportValue, `${ type } stop domain type must match previous stop domain type ${ stopKeyType }`)];
           }
-          if (type !== 'number' && type !== 'string' && type !== 'boolean') {
+          if (type !== 'number' && type !== 'string' && type !== 'boolean' && typeof value !== 'number' && typeof value !== 'string' && typeof value !== 'boolean') {
               return [new ValidationError(options.key, reportValue, 'stop domain value must be a number, string, or boolean')];
           }
           if (type !== 'number' && functionType !== 'categorical') {
@@ -13941,10 +13954,10 @@ ${ JSON.stringify(filterExp, null, 2) }
               }
               return [new ValidationError(options.key, reportValue, message)];
           }
-          if (functionType === 'categorical' && type === 'number' && (!isFinite(value) || Math.floor(value) !== value)) {
-              return [new ValidationError(options.key, reportValue, `integer expected, found ${ value }`)];
+          if (functionType === 'categorical' && type === 'number' && (typeof value !== 'number' || !isFinite(value) || Math.floor(value) !== value)) {
+              return [new ValidationError(options.key, reportValue, `integer expected, found ${ String(value) }`)];
           }
-          if (functionType !== 'categorical' && type === 'number' && previousStopDomainValue !== undefined && value < previousStopDomainValue) {
+          if (functionType !== 'categorical' && type === 'number' && typeof value === 'number' && typeof previousStopDomainValue === 'number' && previousStopDomainValue !== undefined && value < previousStopDomainValue) {
               return [new ValidationError(options.key, reportValue, 'stop domain values must appear in ascending order')];
           } else {
               previousStopDomainValue = value;
@@ -14004,8 +14017,10 @@ ${ JSON.stringify(filterExp, null, 2) }
           'pitch',
           'distance-from-center'
       ]);
-      for (const param of options.valueSpec.expression.parameters) {
-          disallowedParameters.delete(param);
+      if (options.valueSpec && options.valueSpec.expression) {
+          for (const param of options.valueSpec.expression.parameters) {
+              disallowedParameters.delete(param);
+          }
       }
       if (disallowedParameters.size === 0) {
           return [];
@@ -14064,10 +14079,10 @@ ${ JSON.stringify(filterExp, null, 2) }
 
   function validateFilter(options) {
       if (isExpressionFilter(deepUnbundle(options.value))) {
-          const layerType = deepUnbundle(options.layerType);
+          const layerType = options.layerType || 'fill';
           return validateExpression(extend({}, options, {
               expressionContext: 'filter',
-              valueSpec: options.styleSpec[`filter_${ layerType || 'fill' }`]
+              valueSpec: options.styleSpec[`filter_${ layerType }`]
           }));
       } else {
           return validateNonExpressionFilter(options);
@@ -14255,7 +14270,8 @@ ${ JSON.stringify(filterExp, null, 2) }
                   parent = layer;
           });
           if (!parent) {
-              errors.push(new ValidationError(key, layer.ref, `ref layer "${ ref }" not found`));
+              if (typeof ref === 'string')
+                  errors.push(new ValidationError(key, layer.ref, `ref layer "${ ref }" not found`));
           } else if (parent.ref) {
               errors.push(new ValidationError(key, layer.ref, 'ref cannot reference another ref layer'));
           } else {
@@ -14311,6 +14327,7 @@ ${ JSON.stringify(filterExp, null, 2) }
                       layer,
                       key: options.key,
                       value: options.value,
+                      valueSpec: {},
                       style: options.style,
                       styleSpec: options.styleSpec,
                       objectElementValidators: {
@@ -14325,6 +14342,7 @@ ${ JSON.stringify(filterExp, null, 2) }
                       layer,
                       key: options.key,
                       value: options.value,
+                      valueSpec: {},
                       style: options.style,
                       styleSpec: options.styleSpec,
                       objectElementValidators: {
@@ -14543,7 +14561,7 @@ ${ JSON.stringify(filterExp, null, 2) }
           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`));
           }
       }
       return errors;
@@ -14692,7 +14710,7 @@ ${ JSON.stringify(filterExp, null, 2) }
       return sortErrors(errors);
   }
   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);
   }
 
   /* parser generated by jison 0.4.15 */