@mapbox/mapbox-gl-style-spec 14.16.0 → 14.17.0-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mapbox/mapbox-gl-style-spec",
-  "version": "14.16.0",
+  "version": "14.17.0-beta.1",
   "description": "a specification for mapbox gl styles",
   "author": "Mapbox",
   "license": "SEE LICENSE IN LICENSE.txt",

package/reference/v8.json

@@ -1564,7 +1564,6 @@
         },
         "model": {
           "doc": "A 3D model",
-          "experimental": true,
           "sdk-support": {
             "basic functionality": {
               "js": "3.0.0",
@@ -1668,7 +1667,7 @@
       "type": "array",
       "value": "appearance",
       "supported-layer-types": ["symbol"],
-      "private": true,
+      "experimental": true,
       "doc": "Conditional styling applied to symbol layer features based on dynamic conditions. If multiple conditions are true, only the first matching appearance will be applied. Only properties marked with 'Works with appearances' are supported."
     }
   },
@@ -1677,7 +1676,7 @@
       "type": "boolean",
       "doc": "A boolean expression that determines when this appearance should be applied.",
       "expression": {
-        "interpolated": false,
+        "interpolated": true,
         "parameters": [
           "zoom",
           "pitch",
@@ -6610,6 +6609,8 @@
   "indoor": {
     "*": {
       "type": "indoor_source",
+      "private": true,
+      "experimental": true,
       "doc": "Specification of an indoor source - sourceId and sourceLayer required for vector source, for GeoJSON sourceLayers should be omitted."
     }
   },
@@ -11397,9 +11398,11 @@
         "interpolated": false
       },
       "property-type": "data-constant",
-      "experimental": true,
       "sdk-support": {
         "basic functionality": {
+          "js": "3.17.0",
+          "android": "11.10.0",
+          "ios": "11.10.0"
         }
       }
     }

package/types.ts

@@ -329,6 +329,9 @@ export type ImportSpecification = {
 };
 
 export type IndoorSpecification = {
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
     [_: string]: IndoorSourceSpecification
 };
 
@@ -668,6 +671,9 @@ export type FillLayerSpecification = {
         "fill-tunnel-structure-color-transition"?: TransitionSpecification,
         "fill-tunnel-structure-color-use-theme"?: PropertyValueSpecification<string>
     },
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
     "appearances"?: Array<AppearanceSpecification>
 };
 
@@ -758,6 +764,9 @@ export type LineLayerSpecification = {
         "line-occlusion-opacity"?: PropertyValueSpecification<number>,
         "line-occlusion-opacity-transition"?: TransitionSpecification
     },
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
     "appearances"?: Array<AppearanceSpecification>
 };
 
@@ -889,6 +898,9 @@ export type SymbolLayerSpecification = {
         "symbol-z-offset"?: DataDrivenPropertyValueSpecification<number>,
         "symbol-z-offset-transition"?: TransitionSpecification
     },
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
     "appearances"?: Array<AppearanceSpecification>
 };
 
@@ -945,6 +957,9 @@ export type CircleLayerSpecification = {
         "circle-emissive-strength"?: PropertyValueSpecification<number>,
         "circle-emissive-strength-transition"?: TransitionSpecification
     },
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
     "appearances"?: Array<AppearanceSpecification>
 };
 
@@ -982,6 +997,9 @@ export type HeatmapLayerSpecification = {
         "heatmap-opacity"?: PropertyValueSpecification<number>,
         "heatmap-opacity-transition"?: TransitionSpecification
     },
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
     "appearances"?: Array<AppearanceSpecification>
 };
 
@@ -1100,6 +1118,9 @@ export type FillExtrusionLayerSpecification = {
         "fill-extrusion-line-width-transition"?: TransitionSpecification,
         "fill-extrusion-cast-shadows"?: boolean
     },
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
     "appearances"?: Array<AppearanceSpecification>
 };
 
@@ -1237,6 +1258,9 @@ export type BuildingLayerSpecification = {
         "building-flood-light-ground-attenuation"?: PropertyValueSpecification<number>,
         "building-flood-light-ground-attenuation-transition"?: TransitionSpecification
     },
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
     "appearances"?: Array<AppearanceSpecification>
 };
 
@@ -1296,6 +1320,9 @@ export type RasterLayerSpecification = {
         "raster-elevation"?: PropertyValueSpecification<number>,
         "raster-elevation-transition"?: TransitionSpecification
     },
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
     "appearances"?: Array<AppearanceSpecification>
 };
 
@@ -1336,6 +1363,9 @@ export type RasterParticleLayerSpecification = {
         "raster-particle-elevation"?: PropertyValueSpecification<number>,
         "raster-particle-elevation-transition"?: TransitionSpecification
     },
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
     "appearances"?: Array<AppearanceSpecification>
 };
 
@@ -1379,6 +1409,9 @@ export type HillshadeLayerSpecification = {
         "hillshade-emissive-strength"?: PropertyValueSpecification<number>,
         "hillshade-emissive-strength-transition"?: TransitionSpecification
     },
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
     "appearances"?: Array<AppearanceSpecification>
 };
 
@@ -1433,11 +1466,11 @@ export type ModelLayerSpecification = {
         "model-height-based-emissive-strength-multiplier-transition"?: TransitionSpecification,
         "model-cutoff-fade-range"?: ExpressionSpecification,
         "model-front-cutoff"?: PropertyValueSpecification<[number, number, number]>,
-        /**
-         * @experimental This property is experimental and subject to change in future versions.
-         */
         "model-elevation-reference"?: "sea" | "ground" | "hd-road-markup" | ExpressionSpecification
     },
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
     "appearances"?: Array<AppearanceSpecification>
 };
 
@@ -1478,6 +1511,9 @@ export type BackgroundLayerSpecification = {
         "background-emissive-strength"?: PropertyValueSpecification<number>,
         "background-emissive-strength-transition"?: TransitionSpecification
     },
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
     "appearances"?: Array<AppearanceSpecification>
 };
 
@@ -1519,6 +1555,9 @@ export type SkyLayerSpecification = {
         "sky-opacity"?: PropertyValueSpecification<number>,
         "sky-opacity-transition"?: TransitionSpecification
     },
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
     "appearances"?: Array<AppearanceSpecification>
 };
 
@@ -1542,6 +1581,9 @@ export type SlotLayerSpecification = {
     "minzoom"?: never,
     "maxzoom"?: never,
     "filter"?: never,
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
     "appearances"?: Array<AppearanceSpecification>,
     "layout"?: never,
     "paint"?: never
@@ -1561,6 +1603,9 @@ export type ClipLayerSpecification = {
         "clip-layer-types"?: ExpressionSpecification,
         "clip-layer-scope"?: ExpressionSpecification
     },
+    /**
+     * @experimental This property is experimental and subject to change in future versions.
+     */
     "appearances"?: Array<AppearanceSpecification>,
     "paint"?: never
 };

package/validate/validate_filter.ts

@@ -55,23 +55,7 @@ function validateNonExpressionFilter(options: FilterValidatorOptions): Validatio
         valueSpec: styleSpec.filter_operator
     });
 
-    switch (unbundle(value[0])) {
-    case '<':
-    case '<=':
-    case '>':
-    case '>=':
-        if (value.length >= 2 && unbundle(value[1]) === '$type') {
-            errors.push(new ValidationError(key, value, `"$type" cannot be use with operator "${value[0]}"`));
-        }
-        /* falls through */
-    case '==':
-    case '!=':
-        if (value.length !== 3) {
-            errors.push(new ValidationError(key, value, `filter array for operator "${value[0]}" must have 3 elements`));
-        }
-        /* falls through */
-    case 'in':
-    case '!in':
+    const validate = () => {
         if (value.length >= 2) {
             if (!isString(value[1])) {
                 errors.push(new ValidationError(`${key}[1]`, value[1], `string expected, ${getType(value[1])} found`));
@@ -89,6 +73,33 @@ function validateNonExpressionFilter(options: FilterValidatorOptions): Validatio
                 errors.push(new ValidationError(`${key}[${i}]`, value[i], `string, number, or boolean expected, ${getType(value[i])} found.`));
             }
         }
+    };
+
+    switch (unbundle(value[0])) {
+    case '<':
+    case '<=':
+    case '>':
+    case '>=':
+        if (value.length >= 2 && unbundle(value[1]) === '$type') {
+            errors.push(new ValidationError(key, value, `"$type" cannot be use with operator "${value[0]}"`));
+        }
+        if (value.length !== 3) {
+            errors.push(new ValidationError(key, value, `filter array for operator "${value[0]}" must have 3 elements`));
+        }
+        validate();
+        break;
+
+    case '==':
+    case '!=':
+        if (value.length !== 3) {
+            errors.push(new ValidationError(key, value, `filter array for operator "${value[0]}" must have 3 elements`));
+        }
+        validate();
+        break;
+
+    case 'in':
+    case '!in':
+        validate();
         break;
 
     case 'any':

package/validate_mapbox_api_supported.ts

@@ -108,10 +108,9 @@ function getSourcesErrors(sources: SourcesSpecification): {
     return {errors, sourcesCount};
 }
 
-function getImportErrors(imports: ImportSpecification[] = []): {errors: Array<ValidationError>; sourcesCount: number} {
+function getImportErrors(imports: ImportSpecification[] = []): Array<ValidationError> {
     let errors: Array<ValidationError> = [];
 
-    let sourcesCount = 0;
     const validateImports = (imports: ImportSpecification[] = []) => {
         for (const importSpec of imports) {
             const style = importSpec.data;
@@ -125,7 +124,6 @@ function getImportErrors(imports: ImportSpecification[] = []): {errors: Array<Va
 
             if (style.sources) {
                 const sourcesErrors = getSourcesErrors(style.sources);
-                sourcesCount += sourcesErrors.sourcesCount;
                 errors = errors.concat(sourcesErrors.errors);
             }
         }
@@ -136,7 +134,7 @@ function getImportErrors(imports: ImportSpecification[] = []): {errors: Array<Va
         errors.push(new ValidationError(null, null, 'Duplicate ids of imports'));
     }
 
-    return {errors, sourcesCount};
+    return errors;
 }
 
 function getRootErrors(style: MapboxStyleSpecification, specKeys: string[]): Array<ValidationError> {
@@ -238,8 +236,7 @@ export default function validateMapboxApiSupported(style: MapboxStyleSpecificati
 
     if (s.imports) {
         const importsErrors = getImportErrors(s.imports);
-        sourcesCount += importsErrors.sourcesCount;
-        errors = errors.concat(importsErrors.errors);
+        errors = errors.concat(importsErrors);
     }
 
     errors = errors.concat(getMaxSourcesErrors(sourcesCount));