@mapbox/mapbox-gl-style-spec 14.1.0 → 14.2.0

package/expression/compound_expression.js

@@ -82,7 +82,7 @@ class CompoundExpression implements Expression {
 
             // Use a fresh context for each attempted signature so that, if
             // we eventually succeed, we haven't polluted `context.errors`.
-            signatureContext = new ParsingContext(context.registry, context.path, null, context.scope, undefined, context.options);
+            signatureContext = new ParsingContext(context.registry, context.path, null, context.scope, undefined, context._scope, context.options);
 
             // First parse all the args, potentially coercing to the
             // types expected by this overload.

package/expression/definitions/index.js

@@ -46,11 +46,11 @@ import ImageExpression from './image.js';
 import Length from './length.js';
 import Within from './within.js';
 import Distance from './distance.js';
+import {mulberry32} from '../../util/random.js';
 
 import type EvaluationContext from '../evaluation_context.js';
 import type {Varargs} from '../compound_expression.js';
 import type {Expression, ExpressionRegistry} from '../expression.js';
-import {mulberry32} from '../../util/random.js';
 
 const expressions: ExpressionRegistry = {
     // special forms
@@ -168,17 +168,28 @@ function clampToAllowedNumber(value: number, min: number | void, max: number | v
     return value;
 }
 
-function getConfig(ctx: EvaluationContext, key: string, scope: string) {
-    if (scope.length) {
-        key += `\u{1f}${scope}`;
-    }
+const FQIDSeparator = '\u001F';
+
+function getConfig(ctx: EvaluationContext, key: string, scope: ?string) {
+    // Create a fully qualified key from the requested scope
+    // and the scope from the current evaluation context
+    key = [key, scope, ctx.scope].filter(Boolean).join(FQIDSeparator);
+
     const config = ctx.getConfig(key);
     if (!config) return null;
 
     const {type, value, values, minValue, maxValue, stepValue} = config;
 
     const defaultValue = config.default.evaluate(ctx);
-    let result = value ? value.evaluate(ctx) : defaultValue;
+
+    let result = defaultValue;
+    if (value) {
+        // temporarily override scope to parent to evaluate config expressions passed from the parent
+        const originalScope = ctx.scope;
+        ctx.scope = (originalScope || '').split(FQIDSeparator).slice(1).join(FQIDSeparator);
+        result = value.evaluate(ctx);
+        ctx.scope = originalScope;
+    }
 
     if (type) result = coerceValue(type, result);
 
@@ -295,7 +306,7 @@ CompoundExpression.register(expressions, {
         overloads: [
             [
                 [StringType],
-                (ctx, [key]) => getConfig(ctx, key.evaluate(ctx), '')
+                (ctx, [key]) => getConfig(ctx, key.evaluate(ctx))
             ], [
                 [StringType, StringType],
                 (ctx, [key, scope]) => getConfig(ctx, key.evaluate(ctx), scope.evaluate(ctx))

package/expression/definitions/number_format.js

@@ -7,34 +7,6 @@ import type EvaluationContext from '../evaluation_context.js';
 import type ParsingContext from '../parsing_context.js';
 import type {Type} from '../types.js';
 
-declare var Intl: {
-    NumberFormat: Class<Intl$NumberFormat>
-};
-
-declare class Intl$NumberFormat {
-    constructor (
-        locales?: string | string[],
-        options?: NumberFormatOptions
-    ): Intl$NumberFormat;
-
-    static (
-        locales?: string | string[],
-        options?: NumberFormatOptions
-    ): Intl$NumberFormat;
-
-    format(a: number): string;
-
-    resolvedOptions(): any;
-}
-
-type NumberFormatOptions = {
-    style?: 'decimal' | 'currency' | 'percent' | 'unit';
-    currency?: null | string;
-    unit?: null | string;
-    minimumFractionDigits?: null | string;
-    maximumFractionDigits?: null | string;
-};
-
 export default class NumberFormat implements Expression {
     type: Type;
     number: Expression;

package/expression/evaluation_context.js

@@ -20,11 +20,12 @@ class EvaluationContext {
     canonical: null | CanonicalTileID;
     featureTileCoord: ?Point;
     featureDistanceData: ?FeatureDistanceData;
+    scope: ?string;
     options: ?ConfigOptions;
 
     _parseColorCache: {[_: string]: ?Color};
 
-    constructor(options?: ?ConfigOptions) {
+    constructor(scope: ?string, options: ?ConfigOptions) {
         this.globals = (null: any);
         this.feature = null;
         this.featureState = null;
@@ -34,6 +35,7 @@ class EvaluationContext {
         this.canonical = null;
         this.featureTileCoord = null;
         this.featureDistanceData = null;
+        this.scope = scope;
         this.options = options;
     }
 

package/expression/index.js

@@ -65,10 +65,10 @@ export class StyleExpression {
     _warningHistory: {[key: string]: boolean};
     _enumValues: ?{[_: string]: any};
 
-    constructor(expression: Expression, propertySpec: ?StylePropertySpecification, options?: ?ConfigOptions) {
+    constructor(expression: Expression, propertySpec: ?StylePropertySpecification, scope?: ?string, options?: ?ConfigOptions) {
         this.expression = expression;
         this._warningHistory = {};
-        this._evaluator = new EvaluationContext(options);
+        this._evaluator = new EvaluationContext(scope, options);
         this._defaultValue = propertySpec ? getDefaultValue(propertySpec) : null;
         this._enumValues = propertySpec && propertySpec.type === 'enum' ? propertySpec.values : null;
     }
@@ -132,8 +132,8 @@ export function isExpression(expression: mixed): boolean {
  *
  * @private
  */
-export function createExpression(expression: mixed, propertySpec: ?StylePropertySpecification, options?: ?ConfigOptions): Result<StyleExpression, Array<ParsingError>> {
-    const parser = new ParsingContext(definitions, [], propertySpec ? getExpectedType(propertySpec) : undefined, undefined, undefined, options);
+export function createExpression(expression: mixed, propertySpec: ?StylePropertySpecification, scope?: ?string, options?: ?ConfigOptions): Result<StyleExpression, Array<ParsingError>> {
+    const parser = new ParsingContext(definitions, [], propertySpec ? getExpectedType(propertySpec) : undefined, undefined, undefined, scope, options);
 
     // For string-valued properties, coerce to string at the top level rather than asserting.
     const parsed = parser.parse(expression, undefined, undefined, undefined,
@@ -144,7 +144,7 @@ export function createExpression(expression: mixed, propertySpec: ?StyleProperty
         return error(parser.errors);
     }
 
-    return success(new StyleExpression(parsed, propertySpec, options));
+    return success(new StyleExpression(parsed, propertySpec, scope, options));
 }
 
 export class ZoomConstantExpression<Kind: EvaluationKind> {
@@ -249,8 +249,8 @@ export type StylePropertyExpression =
     | CameraExpression
     | CompositeExpression;
 
-export function createPropertyExpression(expression: mixed, propertySpec: StylePropertySpecification, options?: ?ConfigOptions): Result<StylePropertyExpression, Array<ParsingError>> {
-    expression = createExpression(expression, propertySpec, options);
+export function createPropertyExpression(expression: mixed, propertySpec: StylePropertySpecification, scope?: ?string, options?: ?ConfigOptions): Result<StylePropertyExpression, Array<ParsingError>> {
+    expression = createExpression(expression, propertySpec, scope, options);
     if (expression.result === 'error') {
         return expression;
     }
@@ -331,12 +331,12 @@ export class StylePropertyFunction<T> {
     }
 }
 
-export function normalizePropertyExpression<T>(value: PropertyValueSpecification<T>, specification: StylePropertySpecification, options?: ?ConfigOptions): StylePropertyExpression {
+export function normalizePropertyExpression<T>(value: PropertyValueSpecification<T>, specification: StylePropertySpecification, scope?: ?string, options?: ?ConfigOptions): StylePropertyExpression {
     if (isFunction(value)) {
         return (new StylePropertyFunction(value, specification): any);
 
     } else if (isExpression(value) || (Array.isArray(value) && value.length > 0)) {
-        const expression = createPropertyExpression(value, specification, options);
+        const expression = createPropertyExpression(value, specification, scope, options);
         if (expression.result === 'error') {
             // this should have been caught in validation
             throw new Error(expression.value.map(err => `${err.key}: ${err.message}`).join(', '));

package/expression/parsing_context.js

@@ -28,6 +28,7 @@ class ParsingContext {
     key: string;
     scope: Scope;
     errors: Array<ParsingError>;
+    _scope: ?string;
     options: ?ConfigOptions;
 
     // The expected type of this expression. Provided only to allow Expression
@@ -42,6 +43,7 @@ class ParsingContext {
         expectedType: ?Type,
         scope: Scope = new Scope(),
         errors: Array<ParsingError> = [],
+        _scope: ?string,
         options?: ?ConfigOptions
     ) {
         this.registry = registry;
@@ -50,6 +52,7 @@ class ParsingContext {
         this.scope = scope;
         this.errors = errors;
         this.expectedType = expectedType;
+        this._scope = _scope;
         this.options = options;
     }
 
@@ -124,7 +127,7 @@ class ParsingContext {
                 // parsed/compiled result. Expressions that expect an image should
                 // not be resolved here so we can later get the available images.
                 if (!(parsed instanceof Literal) && (parsed.type.kind !== 'resolvedImage') && isConstant(parsed)) {
-                    const ec = new EvaluationContext(this.options);
+                    const ec = new EvaluationContext(this._scope, this.options);
                     try {
                         parsed = new Literal(parsed.type, parsed.evaluate(ec));
                     } catch (e) {
@@ -164,6 +167,7 @@ class ParsingContext {
             expectedType || null,
             scope,
             this.errors,
+            this._scope,
             this.options
         );
     }

package/expression/types/collator.js

@@ -1,37 +1,5 @@
 // @flow
 
-// Flow type declarations for Intl cribbed from
-// https://github.com/facebook/flow/issues/1270
-
-declare var Intl: {
-    Collator: Class<Intl$Collator>
-};
-
-declare class Intl$Collator {
-    constructor (
-        locales?: string | string[],
-        options?: CollatorOptions
-    ): Intl$Collator;
-
-    static (
-        locales?: string | string[],
-        options?: CollatorOptions
-    ): Intl$Collator;
-
-    compare (a: string, b: string): number;
-
-    resolvedOptions(): any;
-}
-
-type CollatorOptions = {
-    localeMatcher?: 'lookup' | 'best fit',
-    usage?: 'sort' | 'search',
-    sensitivity?: 'base' | 'accent' | 'case' | 'variant',
-    ignorePunctuation?: boolean,
-    numeric?: boolean,
-    caseFirst?: 'upper' | 'lower' | 'false'
-}
-
 export default class Collator {
     locale: string | null;
     sensitivity: 'base' | 'accent' | 'case' | 'variant';

package/flow-typed/intl.js

@@ -0,0 +1,58 @@
+// @flow strict
+
+// Flow type declarations for Intl cribbed from
+// https://github.com/facebook/flow/issues/1270
+
+declare var Intl: {
+    NumberFormat: Class<Intl$NumberFormat>;
+    Collator: Class<Intl$Collator>;
+};
+
+declare class Intl$NumberFormat {
+    constructor (
+        locales?: string | string[],
+        options?: NumberFormatOptions
+    ): Intl$NumberFormat;
+
+    static (
+        locales?: string | string[],
+        options?: NumberFormatOptions
+    ): Intl$NumberFormat;
+
+    format(a: number): string;
+
+    resolvedOptions(): any;
+}
+
+type NumberFormatOptions = {
+    style?: 'decimal' | 'currency' | 'percent' | 'unit';
+    currency?: null | string;
+    unit?: null | string;
+    minimumFractionDigits?: null | string;
+    maximumFractionDigits?: null | string;
+};
+
+declare class Intl$Collator {
+    constructor (
+        locales?: string | string[],
+        options?: CollatorOptions
+    ): Intl$Collator;
+
+    static (
+        locales?: string | string[],
+        options?: CollatorOptions
+    ): Intl$Collator;
+
+    compare (a: string, b: string): number;
+
+    resolvedOptions(): any;
+}
+
+type CollatorOptions = {
+    localeMatcher?: 'lookup' | 'best fit',
+    usage?: 'sort' | 'search',
+    sensitivity?: 'base' | 'accent' | 'case' | 'variant',
+    ignorePunctuation?: boolean,
+    numeric?: boolean,
+    caseFirst?: 'upper' | 'lower' | 'false'
+}

package/flow-typed/webgl2.js

@@ -15,7 +15,16 @@ declare interface WebGLQuery {
     new(): WebGLQuery;
 }
 
-export type WebGL2RenderingContext = WebGLRenderingContext & {
+declare class WebGL2RenderingContext extends WebGLRenderingContext {
+    R8: 0x8229;
+    R32F: 0x822E;
+    RGBA16F: 0x881A;
+    RED: 0x1903;
+    HALF_FLOAT: 0x140B;
+    QUERY_RESULT: 0x8866;
+    MIN: 0x8007;
+    MAX: 0x8008;
+
     createVertexArray: () => WebGLVertexArrayObject | null;
     deleteVertexArray: (vertexArray: WebGLVertexArrayObject | null) => void;
     bindVertexArray: (array: WebGLVertexArrayObject | null) => void;

package/format.js

@@ -1,3 +1,4 @@
+// @noflow
 
 import reference from './reference/latest.js';
 import stringifyPretty from 'json-stringify-pretty-compact';

package/function/index.js

@@ -1,3 +1,4 @@
+// @noflow
 
 import * as colorSpaces from '../util/color_spaces.js';
 import Color from '../util/color.js';

package/migrate/v8.js

@@ -1,5 +1,4 @@
-
-import URL from 'url';
+// @noflow
 import {eachSource, eachLayer, eachProperty} from '../visit.js';
 
 function eachLayout(layer, callback) {
@@ -109,7 +108,7 @@ export default function(style) {
     });
 
     function migrateFontstackURL(input) {
-        const inputParsed = URL.parse(input);
+        const inputParsed = new URL(input);
         const inputPathnameParts = inputParsed.pathname.split('/');
 
         if (inputParsed.protocol !== 'mapbox:') {

package/migrate/v9.js

@@ -1,4 +1,4 @@
-
+// @noflow
 import deref from '../deref.js';
 
 function eachLayer(style, callback) {

package/migrate.js

@@ -1,3 +1,4 @@
+// @noflow
 
 import migrateToV8 from './migrate/v8.js';
 import migrateToExpressions from './migrate/expressions.js';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mapbox/mapbox-gl-style-spec",
   "description": "a specification for mapbox gl styles",
-  "version": "14.1.0",
+  "version": "14.2.0",
   "author": "Mapbox",
   "keywords": [
     "mapbox",

package/read_style.js

@@ -1,3 +1,5 @@
+// @noflow
+
 import ParsingError from './error/parsing_error.js';
 import jsonlint from '@mapbox/jsonlint-lines-primitives';
 

package/reference/v8.json

@@ -628,12 +628,12 @@
     },
     "url": {
       "type": "string",
-      "doc": "A URL to a TileJSON resource. Supported protocols are `http:`, `https:`, and `mapbox://<Tileset ID>`."
+      "doc": "A URL to a TileJSON resource. Supported protocols are `http:`, `https:`, and `mapbox://<Tileset ID>`. Required if `tiles` is not provided."
     },
     "tiles": {
       "type": "array",
       "value": "string",
-      "doc": "An array of one or more tile source URLs, as in the TileJSON spec."
+      "doc": "An array of one or more tile source URLs, as in the TileJSON spec. Required if `url` is not provided."
     },
     "bounds": {
       "type": "array",
@@ -707,12 +707,12 @@
     },
     "url": {
       "type": "string",
-      "doc": "A URL to a TileJSON resource. Supported protocols are `http:`, `https:`, and `mapbox://<Tileset ID>`."
+      "doc": "A URL to a TileJSON resource. Supported protocols are `http:`, `https:`, and `mapbox://<Tileset ID>`. Required if `tiles` is not provided."
     },
     "tiles": {
       "type": "array",
       "value": "string",
-      "doc": "An array of one or more tile source URLs, as in the TileJSON spec."
+      "doc": "An array of one or more tile source URLs, as in the TileJSON spec. Required if `url` is not provided."
     },
     "bounds": {
       "type": "array",
@@ -788,12 +788,12 @@
     },
     "url": {
       "type": "string",
-      "doc": "A URL to a TileJSON resource. Supported protocols are `http:`, `https:`, and `mapbox://<Tileset ID>`."
+      "doc": "A URL to a TileJSON resource. Supported protocols are `http:`, `https:`, and `mapbox://<Tileset ID>`. Required if `tiles` is not provided."
     },
     "tiles": {
       "type": "array",
       "value": "string",
-      "doc": "An array of one or more tile source URLs, as in the TileJSON spec."
+      "doc": "An array of one or more tile source URLs, as in the TileJSON spec. Required if `url` is not provided."
     },
     "bounds": {
       "type": "array",
@@ -869,12 +869,12 @@
     },
     "url": {
       "type": "string",
-      "doc": "A URL to a TileJSON resource. Supported protocols are `http:`, `https:`, and `mapbox://<Tileset ID>`."
+      "doc": "A URL to a TileJSON resource. Supported protocols are `http:`, `https:`, and `mapbox://<Tileset ID>`. Required if `tiles` is not provided."
     },
     "tiles": {
       "type": "array",
       "value": "string",
-      "doc": "An array of one or more tile source URLs, as in the TileJSON spec."
+      "doc": "An array of one or more tile source URLs, as in the TileJSON spec. Required if `url` is not provided."
     },
     "bounds": {
       "type": "array",
@@ -1227,7 +1227,7 @@
     },
     "source-layer": {
       "type": "string",
-      "doc": "Layer to use from a vector tile source. Required for vector tile sources; prohibited for all other source types, including GeoJSON sources."
+      "doc": "Layer to use from a vector tile source. Required for vector and raster-array sources; prohibited for all other source types, including GeoJSON sources."
     },
     "slot": {
       "type": "string",
@@ -5450,12 +5450,6 @@
       },
       "transition": true,
       "doc": "Controls the intensity of shading near ground and concave angles between walls. Default value 0.0 disables ambient occlusion and values around 0.3 provide the most plausible results for buildings.",
-      "requires": [
-        "lights",
-        {
-          "!": "fill-extrusion-flood-light-intensity"
-        }
-      ],
       "sdk-support": {
         "basic functionality": {
           "js": "3.0.0",
@@ -5479,10 +5473,7 @@
       "transition": true,
       "doc": "Shades area near ground and concave angles between walls where the radius defines only vertical impact. Default value 3.0 corresponds to height of one floor and brings the most plausible results for buildings. This property works only with legacy light. When 3D lights are enabled `fill-extrusion-ambient-occlusion-wall-radius` and `fill-extrusion-ambient-occlusion-ground-radius` are used instead.",
       "requires": [
-        "fill-extrusion-edge-radius",
-        {
-          "!": "fill-extrusion-flood-light-intensity"
-        }
+        "fill-extrusion-edge-radius"
       ],
       "sdk-support": {
         "basic functionality": {
@@ -5507,10 +5498,7 @@
       "doc": "Shades area near ground and concave angles between walls where the radius defines only vertical impact. Default value 3.0 corresponds to height of one floor and brings the most plausible results for buildings.",
       "requires": [
         "lights",
-        "fill-extrusion-edge-radius",
-        {
-          "!": "fill-extrusion-flood-light-intensity"
-        }
+        "fill-extrusion-edge-radius"
       ],
       "sdk-support": {
         "basic functionality": {
@@ -5534,10 +5522,7 @@
       "transition": true,
       "doc": "The extent of the ambient occlusion effect on the ground beneath the extruded buildings in meters.",
       "requires": [
-        "lights",
-        {
-          "!": "fill-extrusion-flood-light-intensity"
-        }
+        "lights"
       ],
       "sdk-support": {
         "basic functionality": {
@@ -5555,10 +5540,7 @@
       "maximum": 1.0,
       "doc": "Provides a control to futher fine-tune the look of the ambient occlusion on the ground beneath the extruded buildings. Lower values give the effect a more solid look while higher values make it smoother.",
       "requires": [
-        "lights",
-        {
-          "!": "fill-extrusion-flood-light-intensity"
-        }
+        "lights"
       ],
       "transition": true,
       "expression": {
@@ -5581,10 +5563,7 @@
       "default": "#ffffff",
       "doc": "The color of the flood light effect on the walls of the extruded buildings.",
       "requires": [
-        "lights",
-        {
-          "!": "fill-extrusion-ambient-occlusion-intensity"
-        }
+        "lights"
       ],
       "transition": true,
       "expression": {
@@ -5610,10 +5589,7 @@
       "maximum": 1.0,
       "doc": "The intensity of the flood light color.",
       "requires": [
-        "lights",
-        {
-          "!": "fill-extrusion-ambient-occlusion-intensity"
-        }
+        "lights"
       ],
       "transition": true,
       "expression": {
@@ -5639,10 +5615,7 @@
       "minimum": 0,
       "doc": "The extent of the flood light effect on the walls of the extruded buildings in meters.",
       "requires": [
-        "lights",
-        {
-          "!": "fill-extrusion-ambient-occlusion-intensity"
-        }
+        "lights"
       ],
       "transition": true,
       "expression": {
@@ -5670,13 +5643,9 @@
       "type": "number",
       "units": "meters",
       "default": 0,
-      "minimum": 0,
       "doc": "The extent of the flood light effect on the ground beneath the extruded buildings in meters.",
       "requires": [
-        "lights",
-        {
-          "!": "fill-extrusion-ambient-occlusion-intensity"
-        }
+        "lights"
       ],
       "transition": true,
       "expression": {
@@ -5707,10 +5676,7 @@
       "maximum": 1.0,
       "doc": "Provides a control to futher fine-tune the look of the flood light on the ground beneath the extruded buildings. Lower values give the effect a more solid look while higher values make it smoother.",
       "requires": [
-        "lights",
-        {
-          "!": "fill-extrusion-ambient-occlusion-intensity"
-        }
+        "lights"
       ],
       "transition": true,
       "expression": {
@@ -5776,7 +5742,7 @@
       "default": 0.0,
       "minimum": 0.0,
       "maximum": 1.0,
-      "doc": "This parameter defines the range for the fade-out effect before an automatic content cutoff on pitched map views. The automatic cutoff range is calculated according to the minimum required zoom level of the source and layer. The fade range is expressed in relation to the height of the map view. A value of 1.0 indicates that the content is faded to the same extent as the map's height in pixels, while a value close to zero represents a sharp cutoff. When the value is set to 0.0, the cutoff is completely disabled. Note: The property has no effect on the map if terrain is enabled.",
+      "doc": "This parameter defines the range for the fade-out effect before an automatic content cutoff on pitched map views. Fade out is implemented by scaling down and removing buildings in the fade range in a staggered fashion. Opacity is not changed. The fade range is expressed in relation to the height of the map view. A value of 1.0 indicates that the content is faded to the same extent as the map's height in pixels, while a value close to zero represents a sharp cutoff. When the value is set to 0.0, the cutoff is completely disabled. Note: The property has no effect on the map if terrain is enabled.",
       "transition": false,
       "expression": {
         "interpolated": false
@@ -7615,7 +7581,12 @@
       "required": false,
       "property-type": "data-constant",
       "transition": false,
-      "doc": "Displayed band of raster array source layer",
+      "requires": [
+        {
+          "source": "raster-array"
+        }
+      ],
+      "doc": "Displayed band of raster array source layer. Defaults to the first band if not set.",
       "example": "band-name",
       "sdk-support": {
         "basic functionality": {

package/rollup.config.js

@@ -1,3 +1,5 @@
+// @noflow
+
 import path from 'path';
 import replace from '@rollup/plugin-replace';
 import resolve from '@rollup/plugin-node-resolve';

package/style-spec.js

@@ -1,7 +1,7 @@
 // @flow
 
 type ExpressionType = 'data-driven' | 'color-ramp' | 'data-constant' | 'constant';
-type ExpressionParameters = Array<'zoom' | 'feature' | 'feature-state' | 'heatmap-density' | 'line-progress' | 'raster-value' | 'sky-radial-progress' | 'pitch' | 'distance-from-center'>;
+type ExpressionParameters = Array<'zoom' | 'feature' | 'feature-state' | 'heatmap-density' | 'line-progress' | 'raster-value' | 'sky-radial-progress' | 'pitch' | 'distance-from-center' | 'measure-light'>;
 
 export type ExpressionSpecification = {
     interpolated: boolean,

package/test.js

@@ -1,4 +1,5 @@
 #!/usr/bin/env node
+// @noflow
 /* eslint-disable no-process-exit */
 
 import fs from 'fs';

package/util/properties.js

@@ -2,7 +2,9 @@
 
 import type {ExpressionSpecification, StylePropertySpecification} from '../style-spec.js';
 
-function expressionHasParameter(expression: ?ExpressionSpecification, parameter: string): boolean {
+type ExpressionParameter = ExpressionSpecification['parameters'][number];
+
+function expressionHasParameter(expression: ?ExpressionSpecification, parameter: ExpressionParameter): boolean {
     return !!expression && !!expression.parameters && expression.parameters.indexOf(parameter) > -1;
 }
 

package/validate/validate_source.js

@@ -1,6 +1,6 @@
 // @flow
 
-import ValidationError from '../error/validation_error.js';
+import {default as ValidationError, ValidationWarning} from '../error/validation_error.js';
 import {unbundle} from '../util/unbundle_jsonlint.js';
 import validateObject from './validate_object.js';
 import validateEnum from './validate_enum.js';
@@ -30,7 +30,7 @@ export default function validateSource(options: ValidationOptions): Array<Valida
 
     if (['vector', 'raster', 'raster-dem'].includes(type)) {
         if (!value.url && !value.tiles) {
-            errors.push(new ValidationError(key, value, 'Either "url" or "tiles" is required.'));
+            errors.push(new ValidationWarning(key, value, 'Either "url" or "tiles" is required.'));
         }
     }