@mapbox/mapbox-gl-style-spec 13.10.1 → 13.13.0

package/style-spec.js

@@ -31,7 +31,7 @@ export type StylePropertySpecification = {
     type: 'enum',
     'property-type': ExpressionType,
     expression?: ExpressionSpecification,
-    values: {[string]: {}},
+    values: {[_: string]: {}},
     transition: boolean,
     default?: string
 } | {
@@ -64,6 +64,7 @@ import latest from './reference/latest';
 import format from './format';
 import migrate from './migrate';
 import composite from './composite';
+import derefLayers from './deref';
 import diff from './diff';
 import ValidationError from './error/validation_error';
 import ParsingError from './error/parsing_error';
@@ -103,6 +104,7 @@ export {
     format,
     migrate,
     composite,
+    derefLayers,
     diff,
     ValidationError,
     ParsingError,

package/types.js

@@ -8,6 +8,8 @@ export type FormattedSpecification = string;
 
 export type ResolvedImageSpecification = string;
 
+export type PromoteIdSpecification = {[_: string]: string} | string;
+
 export type FilterSpecification =
     | ['has', string]
     | ['!has', string]
@@ -64,7 +66,7 @@ export type StyleSpecification = {|
     "bearing"?: number,
     "pitch"?: number,
     "light"?: LightSpecification,
-    "sources": {[string]: SourceSpecification},
+    "sources": {[_: string]: SourceSpecification},
     "sprite"?: string,
     "glyphs"?: string,
     "transition"?: TransitionSpecification,
@@ -86,7 +88,8 @@ export type VectorSourceSpecification = {
     "scheme"?: "xyz" | "tms",
     "minzoom"?: number,
     "maxzoom"?: number,
-    "attribution"?: string
+    "attribution"?: string,
+    "promoteId"?: PromoteIdSpecification
 }
 
 export type RasterSourceSpecification = {
@@ -125,7 +128,8 @@ export type GeoJSONSourceSpecification = {|
     "clusterMaxZoom"?: number,
     "clusterProperties"?: mixed,
     "lineMetrics"?: boolean,
-    "generateId"?: boolean
+    "generateId"?: boolean,
+    "promoteId"?: PromoteIdSpecification
 |}
 
 export type VideoSourceSpecification = {|

package/validate/validate_expression.js

@@ -17,7 +17,7 @@ export default function validateExpression(options: any): Array<ValidationError>
     const expressionObj = (expression.value: any).expression || (expression.value: any)._styleExpression.expression;
 
     if (options.expressionContext === 'property' && (options.propertyKey === 'text-font') &&
-        expressionObj.possibleOutputs().indexOf(undefined) !== -1) {
+        !expressionObj.outputDefined()) {
         return [new ValidationError(options.key, options.value, `Invalid data expression for "${options.propertyKey}". Output values must be contained as literals within the expression.`)];
     }
 

package/validate/validate_source.js

@@ -4,6 +4,12 @@ import {unbundle} from '../util/unbundle_jsonlint';
 import validateObject from './validate_object';
 import validateEnum from './validate_enum';
 import validateExpression from './validate_expression';
+import validateString from './validate_string';
+import getType from '../util/get_type';
+
+const objectElementValidators = {
+    promoteId: validatePromoteId
+};
 
 export default function validateSource(options) {
     const value = options.value;
@@ -27,7 +33,8 @@ export default function validateSource(options) {
             value,
             valueSpec: styleSpec[`source_${type.replace('-', '_')}`],
             style: options.style,
-            styleSpec
+            styleSpec,
+            objectElementValidators
         });
         return errors;
 
@@ -37,7 +44,8 @@ export default function validateSource(options) {
             value,
             valueSpec: styleSpec.source_geojson,
             style,
-            styleSpec
+            styleSpec,
+            objectElementValidators
         });
         if (value.cluster) {
             for (const prop in value.clusterProperties) {
@@ -89,3 +97,15 @@ export default function validateSource(options) {
         });
     }
 }
+
+function validatePromoteId({key, value}) {
+    if (getType(value) === 'string') {
+        return validateString({key, value});
+    } else {
+        const errors = [];
+        for (const prop in value) {
+            errors.push(...validateString({key: `${key}.${prop}`, value: value[prop]}));
+        }
+        return errors;
+    }
+}

package/visit.js

@@ -25,13 +25,13 @@ function getPropertyReference(propertyName): StylePropertySpecification {
     return (null: any);
 }
 
-export function eachSource(style: StyleSpecification, callback: (SourceSpecification) => void) {
+export function eachSource(style: StyleSpecification, callback: (_: SourceSpecification) => void) {
     for (const k in style.sources) {
         callback(style.sources[k]);
     }
 }
 
-export function eachLayer(style: StyleSpecification, callback: (LayerSpecification) => void) {
+export function eachLayer(style: StyleSpecification, callback: (_: LayerSpecification) => void) {
     for (const layer of style.layers) {
         callback(layer);
     }