azure-maps-control 3.0.0-preview.8 → 3.0.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "azure-maps-control",
   "author": "Microsoft Corporation",
-  "version": "3.0.0-preview.8",
+  "version": "3.0.0",
   "description": "Map SDK for Azure Maps",
   "keywords": [
     "azure",
@@ -20,6 +20,7 @@
     "test": "npm run test:unit && npm run test:func",
     "test:unit": "jest -c test/unit/jest.config.js",
     "test:func": "jest -c test/func/jest.config.js",
+    "test:e2e": "npx playwright test -c test/e2e/playwright.config.ts",
     "pretest:func": "npm run updatePackageVersionForTests -- --isPreTest true",
     "posttest:func": "npm run updatePackageVersionForTests -- --isPreTest false",
     "coverage": "npm run test:unit -- --collectCoverage && npm run test:func",
@@ -27,9 +28,10 @@
     "lint": "eslint --ext .ts,.js --ignore-path .gitignore src/",
     "lint-fix": "eslint --fix --ext .ts,.js --ignore-path .gitignore src/",
     "updateEnvVariables": "node ./bin/updateEnvVariables.js",
-    "updateExampleKeys": "node ./bin/updateExampleKeys.js",
     "updateTestSecrets": "node ./bin/updateTestSecrets.js",
-    "updatePackageVersionForTests": "node ./bin/updatePackageVersionForTests.js"
+    "updatePackageVersionForTests": "node ./bin/updatePackageVersionForTests.js",
+    "set-test-env": "npm run updateEnvVariables -- --variablesJsonPath ./variables.json --appInsightsKey \"8cb5d35d-e977-478d-9264-2cd3f3dbe606\" --envDomain \"t-azmaps.azurelbs.com\" --staticAssetsEnvDomain \"t-azmaps.azurelbs.com\" --aadInstance \"https://login.windows-ppe.net/\" --styleDefinitionsVersion \"2023-01-01\"",
+    "set-prod-env": "npm run updateEnvVariables -- --variablesJsonPath ./variables.json --appInsightsKey \"e96cb745-c6f5-409c-a775-c4313e468c1d\" --envDomain \"atlas.microsoft.com\" --staticAssetsEnvDomain \"atlas.microsoft.com\" --aadInstance \"https://login.microsoftonline.com/\" --styleDefinitionsVersion \"2023-01-01\""
   },
   "dependencies": {
     "@azure/msal-browser": "^2.32.1",
@@ -37,52 +39,56 @@
   },
   "devDependencies": {
     "@mapbox/mapbox-gl-rtl-text": "^0.2.3",
-    "@microsoft/applicationinsights-web": "^2.5.9",
+    "@microsoft/applicationinsights-web": "^3.0.0",
+    "@playwright/test": "^1.36.2",
+    "@rollup/plugin-commonjs": "^25.0.3",
+    "@rollup/plugin-json": "^6.0.0",
+    "@rollup/plugin-node-resolve": "^15.1.0",
     "@testing-library/dom": "^9.3.0",
     "@turf/intersect": "^6.3.0",
-    "@types/jest": "^27.5.1",
+    "@types/jest": "^29.0.0",
     "@types/jwt-decode": "^3.0.0",
-    "@types/lodash": "4.14.191",
-    "@types/mapbox-gl": "^1.13.0",
-    "@types/node": "^18.11.10",
-    "@types/puppeteer": "^1.20.7",
-    "@typescript-eslint/eslint-plugin": "^5.58.0",
-    "@typescript-eslint/parser": "^5.58.0",
+    "@types/lodash": "4.14.195",
+    "@types/node": "^18.17.1",
+    "@types/puppeteer": "^7.0.0",
+    "@typescript-eslint/eslint-plugin": "^6.0.0",
+    "@typescript-eslint/parser": "^6.0.0",
     "atob": "^2.1.2",
-    "azuremaps-maplibre-gl": "3.0.0-pre.10",
+    "azuremaps-maplibre-gl": "^3.2.2",
     "canvas": "^2.10.2",
-    "es-abstract": "^1.17.1",
-    "eslint": "^8.38.0",
+    "es-abstract": "^1.20.1",
+    "eslint": "^8.39.0",
     "eslint-plugin-security": "^1.5.0",
     "estree-walker": "^3.0.0",
-    "fs-extra": "^8.1.0",
+    "fs-extra": "^11.0.0",
     "gl": "^6.0.1",
-    "glob": "^7.1.6",
-    "grunt": "^1.5.3",
-    "jest": "^27.5.1",
+    "glob": "^10.0.0",
+    "grunt": "^1.6.1",
+    "jest": "^29.0.0",
+    "jest-environment-jsdom": "^29.6.1",
     "jest-trx-results-processor": "^3.0.1",
     "jwt-decode": "^3.0.0",
-    "less": "^3.12.2",
+    "less": "^4.0.0",
     "less-plugin-clean-css": "^1.5.1",
     "lodash": "4.17.21",
-    "node-fetch": "^2.6.7",
-    "puppeteer": "^10.2.0",
-    "rollup": "^1.32.1",
-    "rollup-plugin-commonjs": "^10.1.0",
-    "rollup-plugin-json": "^4.0.0",
-    "rollup-plugin-node-resolve": "^5.2.0",
+    "node-fetch": "^2.6.8",
+    "playwright-trx-reporter": "^1.0.6",
+    "puppeteer": "^20.0.0",
+    "rollup": "^3.0.0",
     "rollup-plugin-sourcemaps": "^0.6.3",
     "rollup-plugin-uglify": "^6.0.4",
     "simplify-ts": "^1.0.2",
-    "ts-jest": "^27.1.5",
-    "ts-node": "^8.10.2",
-    "typescript": "^4.3.5",
-    "utf-8-validate": "^5.0.2",
+    "ts-jest": "^29.0.0",
+    "ts-node": "^10.0.0",
+    "typescript": "^5.0.0",
+    "utf-8-validate": "^6.0.0",
     "uuid-random": "^1.3.2",
     "yargs": "^17.6.2"
   },
   "overrides": {
+    "@rollup/pluginutils": "^5.0.2",
     "clean-css": "^5.3.1",
+    "rollup": "^3.0.0",
     "serialize-javascript": "^6.0.0"
   },
   "license": "SEE LICENSE IN LICENSE.TXT",

package/typings/index.d.ts

@@ -1,4 +1,5 @@
 import { PublicClientApplication } from "@azure/msal-browser";
+import { DataDrivenPropertyValueSpecification, PropertyValueSpecification, ExpressionFilterSpecification, PositionAnchor } from "azuremaps-maplibre-gl";
 
 type Position = atlas.data.Position;
 declare namespace atlas {
@@ -1315,6 +1316,21 @@ declare namespace atlas {
              */
             getShape(sourceLayer: string, filter?: Expression): Array<atlas.data.Feature<atlas.data.Geometry, any>>;
         }
+
+        /**
+         * Elevation tile source describes how to access elevation (raster DEM) tile data. 
+         * It can then be used to enable map elevation via `map.enableElevation(elevationSource)`
+         */
+        export class ElevationTileSource extends Source {
+            private options: ElevationTileSourceOptions;
+
+            constructor (id?: string, options?: ElevationTileSourceOptions);
+
+            /**
+             * Gets the options of the ElevationTileSource.
+             */
+            public getOptions (): ElevationTileSourceOptions;
+        }
     }
 
     //math functions
@@ -2075,6 +2091,17 @@ declare namespace atlas {
          * result in only a single frame being rendered.
          */
         triggerRepaint(): void;
+        /**
+         * Loads a 3D terrain mesh, based on a "raster-dem" source.
+         *
+         * @param elevationSource elevation tile source
+         * @param exaggeration the elevation exaggeration factor
+         */
+        enableElevation(elevationSource: string | ElevationTileSource, exaggeration?: number): void;
+        /**
+         * Disables the 3D terrain mesh.
+         */
+        disableElevation(): void;
         /**
          * The callback used when styleOptions.autoResize is true.
          */
@@ -2820,38 +2847,38 @@ declare namespace atlas {
          * Default `"#1A73AA"`.
          * @default "#1A73AA"
          */
-        color?: string | Expression;
+        color?: string | DataDrivenPropertyValueSpecification<string>;
         /**
          * The amount to blur the circles.
          * A value of 1 blurs the circles such that only the center point if at full opacity.
          * Default `0`.
          * @default 0
          */
-        blur?: number | Expression;
+        blur?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * A number between 0 and 1 that indicates the opacity at which the circles will be drawn.
          * Default `1`.
          * @default 1
          */
-        opacity?: number | Expression;
+        opacity?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * The color of the circles' outlines.
          * Default `"#FFFFFF"`.
          * @default "#FFFFFF"
          */
-        strokeColor?: string | Expression;
+        strokeColor?: string | DataDrivenPropertyValueSpecification<string>;
         /**
          * A number between 0 and 1 that indicates the opacity at which the circles' outlines will be drawn.
          * Default `1`.
          * @default 1
          */
-        strokeOpacity?: number | Expression;
+        strokeOpacity?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * The width of the circles' outlines in pixels.
          * Default `2`.
          * @default 2
          */
-        strokeWidth?: number | Expression;
+        strokeWidth?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * Specifies the orientation of circle when map is pitched.
          * <p>`"map"`: The circle is aligned to the plane of the map.</p>
@@ -2866,7 +2893,7 @@ declare namespace atlas {
          * Default `8`.
          * @default 8
          */
-        radius?: number | Expression;
+        radius?: number | DataDrivenPropertyValueSpecification<number>;
     }
 
     /**
@@ -2895,7 +2922,7 @@ declare namespace atlas {
          * Default `"bottom"`.
          * @default "bottom"
          */
-        anchor?: "center" | "left" | "right" | "top" | "bottom" | "top-left" | "top-right" | "bottom-left" | "bottom-right" | Expression;
+        anchor?: PositionAnchor | DataDrivenPropertyValueSpecification<PositionAnchor>;
         /**
          * Specifies if other symbols can overlap this symbol.
          * If true, other symbols can be visible even if they collide with the icon.
@@ -2911,7 +2938,7 @@ declare namespace atlas {
          * Default `"marker-blue"`.
          * @default "marker-blue"
          */
-        image?: string | Expression;
+        image?: string | DataDrivenPropertyValueSpecification<string>;
         /**
          * Specifies an offset distance of the icon from its anchor in pixels.
          * Positive values indicate right and down, while negative values indicate left and up.
@@ -2920,7 +2947,7 @@ declare namespace atlas {
          * Default `[0, 0]`.
          * @default [0, 0]
          */
-        offset?: atlas.Pixel | Expression;
+        offset?: Pixel | DataDrivenPropertyValueSpecification<Pixel>;
         /**
          * Specifies if a symbols icon can be hidden but its text displayed if it is overlapped with another symbol.
          * If true, text will display without their corresponding icons
@@ -2934,7 +2961,7 @@ declare namespace atlas {
          * Default `2`.
          * @default 2
          */
-        padding?: number | Expression;
+        padding?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * Specifies the orientation of the icon when the map is pitched.
          * <p>`"auto"`: Automatically matches the value of `rotationAlignment`.</p>
@@ -2949,7 +2976,7 @@ declare namespace atlas {
          * Default `0`.
          * @default 0
          */
-        rotation?: number | Expression;
+        rotation?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * In combination with the placement property of a SymbolLayerOptions
          * this determines the rotation behavior of icons.
@@ -2968,13 +2995,13 @@ declare namespace atlas {
          * Default `1`.
          * @default 1
          */
-        size?: number | Expression;
+        size?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * A number between 0 and 1 that indicates the opacity at which the icon will be drawn.
          * Default `1`.
          * @default 1
          */
-        opacity?: number | Expression;
+        opacity?: number | DataDrivenPropertyValueSpecification<number>;
     }
 
     /**
@@ -3038,14 +3065,14 @@ declare namespace atlas {
          * Default `1`
          * @default 1
          */
-        intensity?: number | Expression;
+        intensity?: number | PropertyValueSpecification<number>;
 
         /**
          * The opacity at which the heatmap layer will be rendered defined as a number between 0 and 1.
          * Default `1`.
          * @default 1
          */
-        opacity?: number | Expression;
+        opacity?: number | PropertyValueSpecification<number>;
 
         /**
          * The radius in pixels used to render a data point on the heatmap.
@@ -3053,7 +3080,7 @@ declare namespace atlas {
          * Default `30`.
          * @default 30
          */
-        radius?: number | Expression;
+        radius?: number | PropertyValueSpecification<number>;
 
         /**
          * Specifies how much an individual data point contributes to the heatmap.
@@ -3062,7 +3089,7 @@ declare namespace atlas {
          * Default `1`
          * @default 1
          */
-        weight?: number | Expression;
+        weight?: number | PropertyValueSpecification<number>;
     }
 
     /**
@@ -3123,13 +3150,13 @@ declare namespace atlas {
          * Default `0`.
          * @default 0
          */
-        blur?: number | Expression;
+        blur?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * Specifies the color of the line.
          * Default `"#1E90FF"`.
          * @default "#1E90FF"
          */
-        strokeColor?: string | Expression;
+        strokeColor?: string | DataDrivenPropertyValueSpecification<string>;
         /**
          * Specifies the lengths of the alternating dashes and gaps that form the dash pattern.
          * Numbers must be equal or greater than 0. The lengths are scaled by the strokeWidth.
@@ -3149,13 +3176,13 @@ declare namespace atlas {
          * Default `0`.
          * @default 0
          */
-        offset?: number | Expression;
+        offset?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * A number between 0 and 1 that indicates the opacity at which the line will be drawn.
          * Default `1`.
          * @default 1
          */
-        strokeOpacity?: number | Expression;
+        strokeOpacity?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * The amount of offset in pixels to render the line relative to where it would render normally.
          * Negative values indicate left and up.
@@ -3176,7 +3203,7 @@ declare namespace atlas {
          * Default `2`.
          * @default 2
          */
-        strokeWidth?: number | Expression;
+        strokeWidth?: number | DataDrivenPropertyValueSpecification<number>;
     }
 
     /**
@@ -3250,14 +3277,14 @@ declare namespace atlas {
          * Default `0`.
          * @default 0
          */
-        base?: number | Expression;
+        base?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * The color to fill the polygons with.
          * Ignored if `fillPattern` is set.
          * Default `"#1E90FF"`.
          * @default "#1E90FF"
          */
-        fillColor?: string | Expression;
+        fillColor?: string | DataDrivenPropertyValueSpecification<string>;
         /**
          * The height in meters to extrude this layer.
          * This height is relative to the ground.
@@ -3265,7 +3292,7 @@ declare namespace atlas {
          * Default `0`
          * @default 0
          */
-        height?: number | Expression;
+        height?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * A number between 0 and 1 that indicates the opacity at which the fill will be drawn.
          * Default `1`.
@@ -3319,18 +3346,18 @@ declare namespace atlas {
          * Default `"#1E90FF"`.
          * @default "#1E90FF"
          */
-        fillColor?: string | Expression;
+        fillColor?: string | DataDrivenPropertyValueSpecification<string>;
         /**
          * A number between 0 and 1 that indicates the opacity at which the fill will be drawn.
          * Default `0.5`.
          * @default 0.5
          */
-        fillOpacity?: number | Expression;
+        fillOpacity?: number | DataDrivenPropertyValueSpecification<number>;
 
         /**
          * Name of image in sprite to use for drawing image fills. For seamless patterns, image width must be a factor of two (2, 4, 8, ..., 512).
          */
-        fillPattern?: string | Expression;
+        fillPattern?: string | DataDrivenPropertyValueSpecification<string>;
     }
 
     /**
@@ -3374,7 +3401,7 @@ declare namespace atlas {
          * Default `undefined`.
          * @default undefined
          */
-        sortKey?: number | Expression;
+        sortKey?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * Determines whether overlapping symbols in the same layer are rendered in the order
          * that they appear in the data source, or by their y position relative to the viewport.
@@ -3393,7 +3420,7 @@ declare namespace atlas {
          * Default `250`.
          * @default 250
          */
-        lineSpacing?: number | Expression;
+        lineSpacing?: number | PropertyValueSpecification<number>;
     }
 
     /**
@@ -3421,11 +3448,11 @@ declare namespace atlas {
          * Default `"center"`.
          * @default "center"
          */
-        anchor?: "center" | "left" | "right" | "top" | "bottom" | "top-left" | "top-right" | "bottom-left" | "bottom-right" | Expression;
+        anchor?: PositionAnchor | DataDrivenPropertyValueSpecification<PositionAnchor>;
         /**
          * Specifies the name of a property on the features to use for a text label.
          */
-        textField?: string | Expression;
+        textField?: string | DataDrivenPropertyValueSpecification<string>;
         /**
          * The font stack to use for displaying text.
          * Possible values: `"SegoeFrutigerHelveticaMYingHei-Bold"`, `"SegoeFrutigerHelveticaMYingHei-Medium"`,
@@ -3438,7 +3465,7 @@ declare namespace atlas {
          * Default `["StandardFont-Regular"]`.
          * @default ["StandardFont-Regular"]
          */
-        font?: string[] | Expression;
+        font?: string[] | DataDrivenPropertyValueSpecification<string[]>;
         /**
          * Specifies if the other symbols are allowed to collide with the text.
          * If true, other symbols can be visible even if they collide with the text.
@@ -3462,7 +3489,7 @@ declare namespace atlas {
          * Default `[0, 0]`.
          * @default [0, 0]
          */
-        offset?: atlas.Pixel | Expression;
+        offset?: Pixel | DataDrivenPropertyValueSpecification<Pixel>;
         /**
          * Specifies if the text can be hidden if it is overlapped by another symbol.
          * If true, icons will display without their corresponding text
@@ -3477,7 +3504,7 @@ declare namespace atlas {
          * Default `2`.
          * @default 2
          */
-        padding?: number | Expression;
+        padding?: number | PropertyValueSpecification<number>;
         /**
          * Specifies the orientation of the text when the map is pitched.
          * <p>`"auto"`: Automatically matches the value of `rotationAlignment`.</p>
@@ -3493,13 +3520,13 @@ declare namespace atlas {
          * Default: `0`
          * @default 0
          */
-        radialOffset?: number | Expression;
+        radialOffset?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * The amount to rotate the text clockwise in degrees.
          * Default `0`
          * @default 0
          */
-        rotation?: number | Expression;
+        rotation?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * In combination with the `placement` property of the `SymbolLayerOptions`,
          * specifies the rotation behavior of the individual glyphs forming the text.
@@ -3531,33 +3558,33 @@ declare namespace atlas {
          * Default: `undefined`
          * @default undefined
          */
-        variableAnchor?: ("center" | "left" | "right" | "top" | "bottom" | "top-left" | "top-right" | "bottom-left" | "bottom-right")[];
+        variableAnchor?: PositionAnchor[];
         /**
          * The size of the font in pixels.
          * Must be a number greater or equal to 0.
          * Default `16`.
          * @default 16
          */
-        size?: number | Expression;
+        size?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * The color of the text.
          * Default `"#000000"`.
          * @default "#000000"
          */
-        color?: string | Expression;
+        color?: string | DataDrivenPropertyValueSpecification<string>;
         /**
          * The halo's fadeout distance towards the outside in pixels.
          * Must be a number greater or equal to 0.
          * Default `0`.
          * @default 0
          */
-        haloBlur?: number | Expression;
+        haloBlur?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * The color of the text's halo, which helps it stand out from backgrounds.
          * Default `"rgba(0,0,0,0)"`.
          * @default "rgba(0,0,0,0)"
          */
-        haloColor?: string | Expression;
+        haloColor?: string | DataDrivenPropertyValueSpecification<string>;
         /**
          * The distance of the halo to the font outline in pixels.
          * Must be a number greater or equal to 0.
@@ -3565,13 +3592,13 @@ declare namespace atlas {
          * Default `0`.
          * @default 0
          */
-        haloWidth?: number | Expression;
+        haloWidth?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * A number between 0 and 1 that indicates the opacity at which the text will be drawn.
          * Default `1`.
          * @default 1
          */
-        opacity?: number | Expression;
+        opacity?: number | DataDrivenPropertyValueSpecification<number>;
     }
 
     /**
@@ -3903,6 +3930,18 @@ declare namespace atlas {
          * @default 20
          */
         maxZoom?: number;
+        /**
+         * The minimum pitch that the map can be pitched to during the animation. Must be between 0 and 85, and less than or equal to `maxPitch`.
+         * Default `0`.
+         * @default 0
+         */
+        minPitch?: number;
+        /**
+         * The maximum pitch that the map can be pitched to during the animation. Must be between 0 and 85, and greater than or equal to `minPitch`
+         * Default `60`.
+         * @default 60
+         */
+        maxPitch?: number;
         /**
          * A bounding box in which to constrain the viewable map area to.
          * Users won't be able to pan the center of the map outside of this bounding box.
@@ -4073,6 +4112,15 @@ declare namespace atlas {
          *  <ul>
          */
         tiles?: string[];
+        
+        /**
+         * A URL to a TileJSON resource.
+         * Supported protocols are `http:` and `https:`.
+         */
+        url?: string;
+    }
+
+    export interface RasterTileSourceOptions extends VectorTileSourceOptions {
         /**
          * An integer value that specifies the width and height dimensions of the map tiles.
          * For a seamless experience, the tile size must by a multiplier of 2. (i.e. 256, 512, 1024…).
@@ -4080,11 +4128,17 @@ declare namespace atlas {
          * @default 512
          */
         tileSize?: number;
+    }
+
+    export interface ElevationTileSourceOptions extends RasterTileSourceOptions {
         /**
-         * A URL to a TileJSON resource.
-         * Supported protocols are `http:` and `https:`.
+         * DEM tiles encoding format. Supported: `mapbox` or `terrarium`.
+         * <p>`"terrarium": Terrarium format PNG tiles. See https://aws.amazon.com/es/public-datasets/terrain/ for more info.</p>
+         * <p>`"mapbox": Mapbox Terrain RGB tiles. See https://www.mapbox.com/help/access-elevation-data/#mapbox-terrain-rgb for more info.</p>
+         * default `mapbox`
+         * @default mapbox
          */
-        url?: string;
+        encoding?: 'terrarium' | 'mapbox';
     }
 
     /**
@@ -4165,7 +4219,7 @@ declare namespace atlas {
          * Default `"bottom"`
          * @default "bottom"
          */
-        anchor?: string;
+        anchor?: PositionAnchor;
         /**
          * A color value that replaces any {color} placeholder property that has been included in a string htmlContent.
          * default `"#1A73AA"`
@@ -4238,14 +4292,14 @@ declare namespace atlas {
          * Default: `"#FFFFFF"`
          * @default "#FFFFFF"
          */
-        color?: string | Expression;
+        color?: string | DataDrivenPropertyValueSpecification<string>;
         /**
          * Intensity of lighting (on a scale from 0 to 1).
          * Higher numbers will present as more extreme contrast.
          * Default `0.5`
          * @default 0.5
          */
-        intensity?: number | Expression;
+        intensity?: number | DataDrivenPropertyValueSpecification<number>;
         /**
          * Position of the light source relative to lit (extruded) geometries,
          * in [r radial coordinate, a azimuthal angle, p polar angle]
@@ -4743,16 +4797,21 @@ declare namespace atlas {
          * By default, it is set to half the number of CPU cores (capped at 6).
          */
         workerCount?: number;
+        /**
+         * True to validate styles before it's getting applied.
+         * Validation takes significant(few hundred ms) time to process styles during initial load.
+         * @default 'false'
+         */
+        validateStyle?: boolean;
     }
 
-    type ExpressionName = "array" | "boolean" | "collator" | "format" | "literal" | "number" | "object" | "string" | "to-boolean" | "to-color" | "to-number" | "to-string" | "typeof" | "feature-state" | "geometry-type" | "id" | "line-progress" | "properties" | "at" | "get" | "has" | "length" | "!" | "!=" | "<" | "<=" | "==" | ">" | ">=" | "all" | "any" | "case" | "match" | "interpolate" | "interpolate-hcl" | "interpolate-lab" | "step" | "let" | "var" | "concat" | "downcase" | "is-supported-script" | "resolved-locale" | "upcase" | "rgb" | "rgba" | "-" | "*" | "/" | "%" | "^" | "+" | "abs" | "acos" | "asin" | "atan" | "ceil" | "cos" | "e" | "floor" | "ln" | "ln2" | "log10" | "log2" | "max" | "min" | "pi" | "round" | "sin" | "sqrt" | "tan" | "zoom" | "heatmap-density";
     /**
      * Can be specified as the value of filter or certain layer options.
      * An expression defines a formula for computing the value of the property.
      * Expressions are represented as JSON arrays.
      * The first element of an expression is a string naming the expression operator.
      */
-    export type Expression = [ExpressionName, ...any[]];
+    export type Expression = ExpressionFilterSpecification;
 
     /**
     * An aggregate expression defines a calculation that is processed over a set of data.