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

package/expression/definitions/number_format.js

@@ -2,7 +2,7 @@
 
 import {StringType, NumberType} from '../types.js';
 
-import type {Expression} from '../expression.js';
+import type {Expression, SerializedExpression} from '../expression.js';
 import type EvaluationContext from '../evaluation_context.js';
 import type ParsingContext from '../parsing_context.js';
 import type {Type} from '../types.js';
@@ -93,7 +93,7 @@ export default class NumberFormat implements Expression {
         return new NumberFormat(number, locale, currency, minFractionDigits, maxFractionDigits);
     }
 
-    evaluate(ctx: EvaluationContext) {
+    evaluate(ctx: EvaluationContext): string {
         return new Intl.NumberFormat(this.locale ? this.locale.evaluate(ctx) : [],
             {
                 style: this.currency ? "currency" : "decimal",
@@ -119,11 +119,11 @@ export default class NumberFormat implements Expression {
         }
     }
 
-    outputDefined() {
+    outputDefined(): boolean {
         return false;
     }
 
-    serialize() {
+    serialize(): SerializedExpression {
         const options = {};
         if (this.locale) {
             options['locale'] = this.locale.serialize();

package/expression/definitions/slice.js

@@ -4,7 +4,7 @@ import {ValueType, NumberType, StringType, array, toString, isValidType, isValid
 import RuntimeError from '../runtime_error.js';
 import {typeOf} from '../values.js';
 
-import type {Expression} from '../expression.js';
+import type {Expression, SerializedExpression} from '../expression.js';
 import type ParsingContext from '../parsing_context.js';
 import type EvaluationContext from '../evaluation_context.js';
 import type {Type} from '../types.js';
@@ -23,7 +23,7 @@ class Slice implements Expression {
 
     }
 
-    static parse(args: $ReadOnlyArray<mixed>, context: ParsingContext) {
+    static parse(args: $ReadOnlyArray<mixed>, context: ParsingContext): ?Slice {
         if (args.length <= 2 ||  args.length >= 5) {
             return context.error(`Expected 3 or 4 arguments, but found ${args.length - 1} instead.`);
         }
@@ -46,7 +46,7 @@ class Slice implements Expression {
         }
     }
 
-    evaluate(ctx: EvaluationContext) {
+    evaluate(ctx: EvaluationContext): any {
         const input = (this.input.evaluate(ctx): any);
         const beginIndex = (this.beginIndex.evaluate(ctx): number);
 
@@ -70,11 +70,11 @@ class Slice implements Expression {
         }
     }
 
-    outputDefined() {
+    outputDefined(): boolean {
         return false;
     }
 
-    serialize() {
+    serialize(): SerializedExpression {
         if (this.endIndex != null && this.endIndex !== undefined) {
             const endIndex = this.endIndex.serialize();
             return ["slice", this.input.serialize(), this.beginIndex.serialize(), endIndex];

package/expression/definitions/step.js

@@ -5,7 +5,7 @@ import {NumberType} from '../types.js';
 import {findStopLessThanOrEqualTo} from '../stops.js';
 
 import type {Stops} from '../stops.js';
-import type {Expression} from '../expression.js';
+import type {Expression, SerializedExpression} from '../expression.js';
 import type ParsingContext from '../parsing_context.js';
 import type EvaluationContext from '../evaluation_context.js';
 import type {Type} from '../types.js';
@@ -29,7 +29,7 @@ class Step implements Expression {
         }
     }
 
-    static parse(args: $ReadOnlyArray<mixed>, context: ParsingContext) {
+    static parse(args: $ReadOnlyArray<mixed>, context: ParsingContext): ?Step {
         if (args.length - 1 < 4) {
             return context.error(`Expected at least 4 arguments, but found only ${args.length - 1}.`);
         }
@@ -72,7 +72,7 @@ class Step implements Expression {
         return new Step(outputType, input, stops);
     }
 
-    evaluate(ctx: EvaluationContext) {
+    evaluate(ctx: EvaluationContext): any {
         const labels = this.labels;
         const outputs = this.outputs;
 
@@ -105,7 +105,7 @@ class Step implements Expression {
         return this.outputs.every(out => out.outputDefined());
     }
 
-    serialize() {
+    serialize(): SerializedExpression {
         const serialized = ["step", this.input.serialize()];
         for (let i = 0; i < this.labels.length; i++) {
             if (i > 0) {

package/expression/definitions/var.js

@@ -16,7 +16,7 @@ class Var implements Expression {
         this.boundExpression = boundExpression;
     }
 
-    static parse(args: $ReadOnlyArray<mixed>, context: ParsingContext) {
+    static parse(args: $ReadOnlyArray<mixed>, context: ParsingContext): void | Var {
         if (args.length !== 2 || typeof args[1] !== 'string')
             return context.error(`'var' expression requires exactly one string literal argument.`);
 
@@ -28,17 +28,17 @@ class Var implements Expression {
         return new Var(name, context.scope.get(name));
     }
 
-    evaluate(ctx: EvaluationContext) {
+    evaluate(ctx: EvaluationContext): any {
         return this.boundExpression.evaluate(ctx);
     }
 
     eachChild() {}
 
-    outputDefined() {
+    outputDefined(): boolean {
         return false;
     }
 
-    serialize() {
+    serialize(): Array<string> {
         return ["var", this.name];
     }
 }

package/expression/definitions/within.js

@@ -3,7 +3,7 @@
 import {isValue} from '../values.js';
 import type {Type} from '../types.js';
 import {BooleanType} from '../types.js';
-import type {Expression} from '../expression.js';
+import type {Expression, SerializedExpression} from '../expression.js';
 import type ParsingContext from '../parsing_context.js';
 import type EvaluationContext from '../evaluation_context.js';
 import type {GeoJSON, GeoJSONPolygon, GeoJSONMultiPolygon} from '@mapbox/geojson-types';
@@ -148,7 +148,7 @@ function lineStringWithinPolygons(line, polygons) {
     return false;
 }
 
-function getTilePolygon(coordinates, bbox, canonical) {
+function getTilePolygon(coordinates, bbox: BBox, canonical: CanonicalTileID) {
     const polygon = [];
     for (let i = 0; i < coordinates.length; i++) {
         const ring = [];
@@ -162,7 +162,7 @@ function getTilePolygon(coordinates, bbox, canonical) {
     return polygon;
 }
 
-function getTilePolygons(coordinates, bbox, canonical) {
+function getTilePolygons(coordinates, bbox, canonical: CanonicalTileID) {
     const polygons = [];
     for (let i = 0; i < coordinates.length; i++) {
         const polygon = getTilePolygon(coordinates[i], bbox, canonical);
@@ -188,10 +188,11 @@ function resetBBox(bbox) {
     bbox[2] = bbox[3] = -Infinity;
 }
 
-function getTilePoints(geometry, pointBBox, polyBBox, canonical) {
+function getTilePoints(geometry, pointBBox, polyBBox, canonical: CanonicalTileID) {
     const worldSize = Math.pow(2, canonical.z) * EXTENT;
     const shifts = [canonical.x * EXTENT, canonical.y * EXTENT];
     const tilePoints = [];
+    if (!geometry) return tilePoints;
     for (const points of geometry) {
         for (const point of points) {
             const p = [point.x + shifts[0], point.y + shifts[1]];
@@ -202,10 +203,11 @@ function getTilePoints(geometry, pointBBox, polyBBox, canonical) {
     return tilePoints;
 }
 
-function getTileLines(geometry, lineBBox, polyBBox, canonical) {
+function getTileLines(geometry, lineBBox, polyBBox, canonical: CanonicalTileID) {
     const worldSize = Math.pow(2, canonical.z) * EXTENT;
     const shifts = [canonical.x * EXTENT, canonical.y * EXTENT];
     const tileLines = [];
+    if (!geometry) return tileLines;
     for (const line of geometry) {
         const tileLine = [];
         for (const point of line) {
@@ -231,6 +233,9 @@ function pointsWithinPolygons(ctx: EvaluationContext, polygonGeometry: GeoJSONPo
     const polyBBox = [Infinity, Infinity, -Infinity, -Infinity];
 
     const canonical = ctx.canonicalID();
+    if (!canonical) {
+        return false;
+    }
 
     if (polygonGeometry.type === 'Polygon') {
         const tilePolygon = getTilePolygon(polygonGeometry.coordinates, polyBBox, canonical);
@@ -259,6 +264,9 @@ function linesWithinPolygons(ctx: EvaluationContext, polygonGeometry: GeoJSONPol
     const polyBBox = [Infinity, Infinity, -Infinity, -Infinity];
 
     const canonical = ctx.canonicalID();
+    if (!canonical) {
+        return false;
+    }
 
     if (polygonGeometry.type === 'Polygon') {
         const tilePolygon = getTilePolygon(polygonGeometry.coordinates, polyBBox, canonical);
@@ -292,7 +300,7 @@ class Within implements Expression {
         this.geometries = geometries;
     }
 
-    static parse(args: $ReadOnlyArray<mixed>, context: ParsingContext) {
+    static parse(args: $ReadOnlyArray<mixed>, context: ParsingContext): ?Within {
         if (args.length !== 2)
             return context.error(`'within' expression requires exactly one argument, but found ${args.length - 1} instead.`);
         if (isValue(args[1])) {
@@ -316,7 +324,7 @@ class Within implements Expression {
         return context.error(`'within' expression requires valid geojson object that contains polygon geometry type.`);
     }
 
-    evaluate(ctx: EvaluationContext) {
+    evaluate(ctx: EvaluationContext): boolean {
         if (ctx.geometry() != null && ctx.canonicalID() != null) {
             if (ctx.geometryType() === 'Point') {
                 return pointsWithinPolygons(ctx, this.geometries);
@@ -333,7 +341,7 @@ class Within implements Expression {
         return true;
     }
 
-    serialize(): Array<mixed> {
+    serialize(): SerializedExpression {
         return ["within", this.geojson];
     }
 

package/expression/evaluation_context.js

@@ -16,7 +16,7 @@ class EvaluationContext {
     featureState: ?FeatureState;
     formattedSection: ?FormattedSection;
     availableImages: ?Array<string>;
-    canonical: ?CanonicalTileID;
+    canonical: null | CanonicalTileID;
     featureTileCoord: ?Point;
     featureDistanceData: ?FeatureDistanceData;
 
@@ -34,27 +34,27 @@ class EvaluationContext {
         this.featureDistanceData = null;
     }
 
-    id() {
-        return this.feature && 'id' in this.feature ? this.feature.id : null;
+    id(): number | null {
+        return this.feature && 'id' in this.feature && this.feature.id ? this.feature.id : null;
     }
 
-    geometryType() {
+    geometryType(): null | string {
         return this.feature ? typeof this.feature.type === 'number' ? geometryTypes[this.feature.type] : this.feature.type : null;
     }
 
-    geometry() {
+    geometry(): ?Array<Array<Point>> {
         return this.feature && 'geometry' in this.feature ? this.feature.geometry : null;
     }
 
-    canonicalID() {
+    canonicalID(): null | CanonicalTileID {
         return this.canonical;
     }
 
-    properties() {
+    properties(): {[string]: any} {
         return (this.feature && this.feature.properties) || {};
     }
 
-    distanceFromCenter() {
+    distanceFromCenter(): number {
         if (this.featureTileCoord && this.featureDistanceData) {
 
             const c = this.featureDistanceData.center;

package/expression/expression.js

@@ -4,7 +4,7 @@ import type {Type} from './types.js';
 import type ParsingContext from './parsing_context.js';
 import type EvaluationContext from './evaluation_context.js';
 
-type SerializedExpression = Array<mixed> | string | number | boolean | null;
+export type SerializedExpression = Array<mixed> | Array<string> | string | number | boolean | null;
 
 export interface Expression {
     +type: Type;

package/expression/index.js

@@ -31,7 +31,7 @@ import type {FeatureDistanceData} from '../feature_filter/index.js';
 
 export type Feature = {
     +type: 1 | 2 | 3 | 'Unknown' | 'Point' | 'MultiPoint' | 'LineString' | 'MultiLineString' | 'Polygon' | 'MultiPolygon',
-    +id?: any,
+    +id?: number | null,
     +properties: {[_: string]: any},
     +patterns?: {[_: string]: {"min": string, "mid": string, "max": string}},
     +geometry?: Array<Array<Point>>
@@ -69,7 +69,7 @@ export class StyleExpression {
         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;
@@ -82,7 +82,7 @@ export class StyleExpression {
         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;
@@ -110,7 +110,7 @@ export class StyleExpression {
     }
 }
 
-export function isExpression(expression: mixed) {
+export function isExpression(expression: mixed): boolean {
     return Array.isArray(expression) && expression.length > 0 &&
         typeof expression[0] === 'string' && expression[0] in definitions;
 }

package/expression/is_constant.js

@@ -4,7 +4,7 @@ import CompoundExpression from './compound_expression.js';
 import Within from './definitions/within.js';
 import type {Expression} from './expression.js';
 
-function isFeatureConstant(e: Expression) {
+function isFeatureConstant(e: Expression): boolean {
     if (e instanceof CompoundExpression) {
         if (e.name === 'get' && e.args.length === 1) {
             return false;
@@ -34,7 +34,7 @@ function isFeatureConstant(e: Expression) {
     return result;
 }
 
-function isStateConstant(e: Expression) {
+function isStateConstant(e: Expression): boolean {
     if (e instanceof CompoundExpression) {
         if (e.name === 'feature-state') {
             return false;
@@ -47,7 +47,7 @@ function isStateConstant(e: Expression) {
     return result;
 }
 
-function isGlobalPropertyConstant(e: Expression, properties: Array<string>) {
+function isGlobalPropertyConstant(e: Expression, properties: Array<string>): boolean {
     if (e instanceof CompoundExpression && properties.indexOf(e.name) >= 0) { return false; }
     let result = true;
     e.eachChild((arg) => {

package/expression/parsing_context.js

@@ -155,7 +155,7 @@ class ParsingContext {
      * parsing, is copied by reference rather than cloned.
      * @private
      */
-    concat(index: number, expectedType?: ?Type, bindings?: Array<[string, Expression]>) {
+    concat(index: number, expectedType?: ?Type, bindings?: Array<[string, Expression]>): ParsingContext {
         const path = typeof index === 'number' ? this.path.concat(index) : this.path;
         const scope = bindings ? this.scope.concat(bindings) : this.scope;
         return new ParsingContext(

package/expression/runtime_error.js

@@ -9,7 +9,7 @@ class RuntimeError {
         this.message = message;
     }
 
-    toJSON() {
+    toJSON(): string {
         return this.message;
     }
 }

package/expression/scope.js

@@ -17,7 +17,7 @@ class Scope {
         }
     }
 
-    concat(bindings: Array<[string, Expression]>) {
+    concat(bindings: Array<[string, Expression]>): Scope {
         return new Scope(this, bindings);
     }
 

package/expression/stops.js

@@ -10,7 +10,7 @@ export type Stops = Array<[number, Expression]>;
  * Returns the index of the last stop <= input, or 0 if it doesn't exist.
  * @private
  */
-export function findStopLessThanOrEqualTo(stops: Array<number>, input: number) {
+export function findStopLessThanOrEqualTo(stops: Array<number>, input: number): number {
     const lastIndex = stops.length - 1;
     let lowerIndex = 0;
     let upperIndex = lastIndex;

package/expression/values.js

@@ -107,7 +107,7 @@ export function typeOf(value: Value): Type {
     }
 }
 
-export function toString(value: Value) {
+export function toString(value: Value): string {
     const type = typeof value;
     if (value === null) {
         return '';

package/feature_filter/index.js

@@ -15,7 +15,7 @@ export type FeatureFilter = {filter: FilterExpression, dynamicFilter?: FilterExp
 export default createFilter;
 export {isExpressionFilter, isDynamicFilter, extractStaticFilter};
 
-function isExpressionFilter(filter: any) {
+function isExpressionFilter(filter: any): boolean {
     if (filter === true || filter === false) {
         return true;
     }

package/function/convert.js

@@ -1,15 +1,15 @@
 // @flow
 
 import assert from 'assert';
-import type {StylePropertySpecification} from '../style-spec.js';
 
-export default convertFunction;
+import type {StylePropertySpecification} from '../style-spec.js';
+import type {ExpressionSpecification} from '../types.js';
 
 function convertLiteral(value) {
     return typeof value === 'object' ? ['literal', value] : value;
 }
 
-function convertFunction(parameters: any, propertySpec: StylePropertySpecification) {
+export default function convertFunction(parameters: any, propertySpec: StylePropertySpecification): ExpressionSpecification {
     let stops = parameters.stops;
     if (!stops) {
         // identity function
@@ -244,7 +244,7 @@ function getFunctionType(parameters, propertySpec) {
 }
 
 // "String with {name} token" => ["concat", "String with ", ["get", "name"], " token"]
-export function convertTokenString(s: string) {
+export function convertTokenString(s: string): string | ExpressionSpecification {
     const result = ['concat'];
     const re = /{([^{}]+)}/g;
     let pos = 0;

package/migrate/expressions.js

@@ -15,7 +15,7 @@ import type {StyleSpecification} from '../types.js';
  * this will convert (a) "stop" functions, and (b) legacy filters to their
  * expression equivalents.
  */
-export default function(style: StyleSpecification) {
+export default function(style: StyleSpecification): StyleSpecification {
     const converted = [];
 
     eachLayer(style, (layer) => {

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.6",
+  "version": "13.24.0-beta.1",
   "author": "Mapbox",
   "keywords": [
     "mapbox",

package/reference/latest.js

@@ -1,3 +1,7 @@
+// @flow
 
 import spec from './v8.json';
+
+export type StyleReference = typeof spec;
+
 export default spec;

package/reference/v8.json

@@ -96,7 +96,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": [-154, 50],
@@ -3991,9 +3991,6 @@
         },
         "winkelTripel": {
           "doc": "A Winkel Tripel projection."
-        },
-        "globe": {
-          "doc": "A globe projection."
         }
       },
       "default": "mercator",

package/types.js

@@ -95,7 +95,7 @@ export type FogSpecification = {|
 |}
 
 export type ProjectionSpecification = {|
-    "name": "albers" | "equalEarth" | "equirectangular" | "lambertConformalConic" | "mercator" | "naturalEarth" | "winkelTripel" | "globe",
+    "name": "albers" | "equalEarth" | "equirectangular" | "lambertConformalConic" | "mercator" | "naturalEarth" | "winkelTripel",
     "center"?: [number, number],
     "parallels"?: [number, number]
 |}

package/validate/validate.js

@@ -1,3 +1,4 @@
+// @flow
 
 import extend from '../util/extend.js';
 import {unbundle, deepUnbundle} from '../util/unbundle_jsonlint.js';
@@ -23,6 +24,10 @@ import validateFormatted from './validate_formatted.js';
 import validateImage from './validate_image.js';
 import validateProjection from './validate_projection.js';
 
+import type {StyleReference} from '../reference/latest.js';
+import type {StyleSpecification} from '../types.js';
+import type ValidationError from '../error/validation_error.js';
+
 const VALIDATORS = {
     '*'() {
         return [];
@@ -55,8 +60,15 @@ const VALIDATORS = {
 //   scalar value.
 // - valueSpec: current spec being evaluated. Tracks value.
 // - styleSpec: current full spec being evaluated.
+export type ValidationOptions = {
+    key: string;
+    value: Object;
+    valueSpec: Object;
+    style: $Shape<StyleSpecification>;
+    styleSpec: StyleReference;
+}
 
-export default function validate(options) {
+export default function validate(options: ValidationOptions): Array<ValidationError> {
     const value = options.value;
     const valueSpec = options.valueSpec;
     const styleSpec = options.styleSpec;

package/validate/validate_array.js

@@ -1,9 +1,16 @@
+// @flow
 
 import getType from '../util/get_type.js';
 import validate from './validate.js';
 import ValidationError from '../error/validation_error.js';
 
-export default function validateArray(options) {
+import type {ValidationOptions} from './validate.js';
+
+type Options = ValidationOptions & {
+    arrayElementValidator: Function;
+};
+
+export default function validateArray(options: Options): Array<ValidationError> {
     const array = options.value;
     const arraySpec = options.valueSpec;
     const style = options.style;
@@ -27,7 +34,8 @@ export default function validateArray(options) {
         "type": arraySpec.value,
         "values": arraySpec.values,
         "minimum": arraySpec.minimum,
-        "maximum": arraySpec.maximum
+        "maximum": arraySpec.maximum,
+        function: undefined
     };
 
     if (styleSpec.$version < 7) {

package/validate/validate_boolean.js

@@ -1,8 +1,11 @@
+// @flow
 
 import getType from '../util/get_type.js';
 import ValidationError from '../error/validation_error.js';
 
-export default function validateBoolean(options) {
+import type {ValidationOptions} from './validate.js';
+
+export default function validateBoolean(options: ValidationOptions): Array<ValidationError> {
     const value = options.value;
     const key = options.key;
     const type = getType(value);

package/validate/validate_color.js

@@ -1,9 +1,12 @@
+// @flow
 
 import ValidationError from '../error/validation_error.js';
 import getType from '../util/get_type.js';
 import {parseCSSColor} from 'csscolorparser';
 
-export default function validateColor(options) {
+import type {ValidationOptions} from './validate.js';
+
+export default function validateColor(options: ValidationOptions): Array<ValidationError> {
     const key = options.key;
     const value = options.value;
     const type = getType(value);

package/validate/validate_enum.js

@@ -1,8 +1,11 @@
+// @flow
 
 import ValidationError from '../error/validation_error.js';
 import {unbundle} from '../util/unbundle_jsonlint.js';
 
-export default function validateEnum(options) {
+import type {ValidationOptions} from './validate.js';
+
+export default function validateEnum(options: ValidationOptions): Array<ValidationError> {
     const key = options.key;
     const value = options.value;
     const valueSpec = options.valueSpec;

package/validate/validate_expression.js

@@ -52,8 +52,11 @@ export function disallowedFilterParameters(e: Expression, options: any): Array<V
         '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) {

package/validate/validate_filter.js

@@ -1,3 +1,4 @@
+// @flow
 
 import ValidationError from '../error/validation_error.js';
 import validateExpression from './validate_expression.js';
@@ -7,13 +8,20 @@ import {unbundle, deepUnbundle} from '../util/unbundle_jsonlint.js';
 import extend from '../util/extend.js';
 import {isExpressionFilter} from '../feature_filter/index.js';
 
-export default function validateFilter(options) {
+import type {ValidationOptions} from './validate.js';
+
+type Options = ValidationOptions & {
+    layerType: string;
+}
+
+export default function validateFilter(options: Options): Array<ValidationError> {
     if (isExpressionFilter(deepUnbundle(options.value))) {
-        const layerType = deepUnbundle(options.layerType);
+        // We default to a layerType of `fill` because that points to a non-dynamic filter definition within the style-spec.
+        const layerType = options.layerType || 'fill';
+
         return validateExpression(extend({}, options, {
             expressionContext: 'filter',
-            // We default to a layerType of `fill` because that points to a non-dynamic filter definition within the style-spec.
-            valueSpec: options.styleSpec[`filter_${layerType || 'fill'}`]
+            valueSpec: options.styleSpec[`filter_${layerType}`]
         }));
     } else {
         return validateNonExpressionFilter(options);