@mapbox/mapbox-gl-style-spec 14.11.0-beta.2 → 14.12.0-beta.1

package/expression/compound_expression.ts

@@ -73,7 +73,7 @@ class CompoundExpression implements Expression {
 
         const overloadParams = [];
 
-        let signatureContext: ParsingContext = (null as any);
+        let signatureContext: ParsingContext = null;
 
         let overloadIndex = -1;
 

package/expression/definitions/coalesce.ts

@@ -21,7 +21,7 @@ class Coalesce implements Expression {
             // @ts-expect-error - TS2322 - Type 'void' is not assignable to type 'Coalesce'.
             return context.error("Expectected at least one argument.");
         }
-        let outputType: Type = (null as any);
+        let outputType: Type = null;
         const expectedType = context.expectedType;
         if (expectedType && expectedType.kind !== 'value') {
             outputType = expectedType;
@@ -46,7 +46,7 @@ class Coalesce implements Expression {
 
         return needsAnnotation ?
             new Coalesce(ValueType, parsedArgs) :
-            new Coalesce((outputType as any), parsedArgs);
+            new Coalesce(outputType, parsedArgs);
     }
 
     evaluate(ctx: EvaluationContext): any {

package/expression/definitions/config.ts

@@ -101,7 +101,7 @@ class Config implements Expression {
             if (typeof result === 'number') {
                 result = clampToAllowedNumber(result, minValue, maxValue, stepValue);
             } else if (Array.isArray(result)) {
-                result = result.map((item) => typeof item === 'number' ? clampToAllowedNumber(item, minValue, maxValue, stepValue) : item);
+                result = result.map((item) => (typeof item === 'number' ? clampToAllowedNumber(item, minValue, maxValue, stepValue) : item));
             }
         }
 

package/expression/definitions/image.ts

@@ -167,17 +167,7 @@ export default class ImageExpression implements Expression {
             for (const key in params) {
                 if (params[key]) {
                     try {
-                        const color = params[key].evaluate(ctx);
-                        const msg = `Ignoring image parameter "${key}" with semi-transparent color ${color.toString()}`;
-
-                        if (color.a !== 1) {
-                            if (!this._imageWarnHistory[msg]) {
-                                console.warn(msg);
-                                this._imageWarnHistory[msg] = true;
-                            }
-                            continue;
-                        }
-                        result[key] = color;
+                        result[key] = params[key].evaluate(ctx);
                     } catch (err) {
                         continue;
                     }

package/expression/definitions/index.ts

@@ -47,6 +47,7 @@ import Distance from './distance';
 import {mulberry32} from '../../util/random';
 
 import type {Type} from '../types';
+import type {Value} from '../values';
 import type EvaluationContext from '../evaluation_context';
 import type {Varargs} from '../compound_expression';
 import type {Expression, ExpressionRegistry} from '../expression';
@@ -242,7 +243,7 @@ CompoundExpression.register(expressions, {
     'properties': [
         ObjectType,
         [],
-        (ctx) => ctx.properties()
+        (ctx) => ctx.properties() as Value
     ],
     'geometry-type': [
         StringType,
@@ -302,7 +303,7 @@ CompoundExpression.register(expressions, {
     'accumulated': [
         ValueType,
         [],
-        (ctx) => ctx.globals.accumulated === undefined ? null : ctx.globals.accumulated
+        (ctx) => (ctx.globals.accumulated === undefined ? null : ctx.globals.accumulated)
     ],
     '+': [
         NumberType,

package/expression/definitions/interpolate.ts

@@ -91,7 +91,7 @@ class Interpolate implements Expression {
 
             interpolation = {
                 name: 'cubic-bezier',
-                controlPoints: (controlPoints as any)
+                controlPoints
             };
         } else {
             return context.error(`Unknown interpolation type ${String(interpolation[0])}`, 1, 0);
@@ -110,7 +110,7 @@ class Interpolate implements Expression {
 
         const stops: Stops = [];
 
-        let outputType: Type = (null as any);
+        let outputType: Type = null;
         if (operator === 'interpolate-hcl' || operator === 'interpolate-lab') {
             outputType = ColorType;
         } else if (context.expectedType && context.expectedType.kind !== 'value') {
@@ -179,7 +179,7 @@ class Interpolate implements Expression {
         const outputUpper = outputs[index + 1].evaluate(ctx);
 
         if (this.operator === 'interpolate') {
-            return (interpolate[this.type.kind.toLowerCase()] as any)(outputLower, outputUpper, t); // eslint-disable-line import/namespace
+            return (interpolate[this.type.kind.toLowerCase()] as any)(outputLower, outputUpper, t);
         } else if (this.operator === 'interpolate-hcl') {
             return hcl.reverse(hcl.interpolate(hcl.forward(outputLower), hcl.forward(outputUpper), t));
         } else {

package/expression/definitions/match.ts

@@ -138,7 +138,7 @@ class Match implements Expression {
             }
         }
 
-        const coerceLabel = (label: number | string) => this.inputType.kind === 'number' ? Number(label) : label;
+        const coerceLabel = (label: number | string) => (this.inputType.kind === 'number' ? Number(label) : label);
 
         for (const [outputIndex, labels] of groupedByOutput) {
             if (labels.length === 1) {

package/expression/definitions/step.ts

@@ -40,7 +40,7 @@ class Step implements Expression {
 
         const stops: Stops = [];
 
-        let outputType: Type = (null as any);
+        let outputType: Type = null;
         if (context.expectedType && context.expectedType.kind !== 'value') {
             outputType = context.expectedType;
         }

package/expression/evaluation_context.ts

@@ -27,7 +27,7 @@ class EvaluationContext {
     };
 
     constructor(scope?: string | null, options?: ConfigOptions | null) {
-        this.globals = (null as any);
+        this.globals = null;
         this.feature = null;
         this.featureState = null;
         this.formattedSection = null;
@@ -40,7 +40,7 @@ class EvaluationContext {
         this.options = options;
     }
 
-    id(): number | null {
+    id(): string | number | null {
         return this.feature && this.feature.id !== undefined ? this.feature.id : null;
     }
 
@@ -56,9 +56,7 @@ class EvaluationContext {
         return this.canonical;
     }
 
-    properties(): {
-        [key: string]: any;
-        } {
+    properties(): {readonly [key: string]: unknown} {
         return (this.feature && this.feature.properties) || {};
     }
 

package/expression/index.ts

@@ -39,13 +39,9 @@ import type {ImageId} from './types/image_id';
 
 export interface Feature {
     readonly type: 0 | 1 | 2 | 3 | 'Unknown' | 'Point' | 'LineString' | 'Polygon';
-    readonly id?: number | null;
-    readonly properties: {
-        [_: string]: any;
-    };
-    readonly patterns?: {
-        [_: string]: string;
-    };
+    readonly id?: string | number | null;
+    readonly properties: Record<PropertyKey, unknown>;
+    readonly patterns?: Record<PropertyKey, string>;
     readonly geometry?: Array<Array<Point>>;
 }
 
@@ -135,7 +131,7 @@ export class StyleExpression {
                 throw new RuntimeError(`Expected value to be one of ${Object.keys(this._enumValues).map(v => JSON.stringify(v)).join(', ')}, but found ${JSON.stringify(val)} instead.`);
             }
             return val;
-        } catch (e: any) {
+        } catch (e) {
             if (!this._warningHistory[e.message]) {
                 this._warningHistory[e.message] = true;
                 if (typeof console !== 'undefined') {

package/expression/parsing_context.ts

@@ -157,7 +157,7 @@ class ParsingContext {
                     const ec = new EvaluationContext(this._scope, this.options);
                     try {
                         parsed = new Literal(parsed.type, parsed.evaluate(ec));
-                    } catch (e: any) {
+                    } catch (e) {
                         this.error(e.message);
                         return null;
                     }

package/expression/types/image_id.ts

@@ -1,5 +1,7 @@
 import type {Brand} from '../../types/brand';
 
+const separator = '\u001F';
+
 export type ImageIdSpec = {
     name: string;
     iconsetId?: string;
@@ -35,16 +37,12 @@ export class ImageId {
     }
 
     static toString(id: ImageId | ImageIdSpec): StringifiedImageId {
-        return JSON.stringify({name: id.name, iconsetId: id.iconsetId}) as StringifiedImageId;
+        return (id.iconsetId ? `${id.name}${separator}${id.iconsetId}` : id.name) as StringifiedImageId;
     }
 
     static parse(str: StringifiedImageId): ImageId | null {
-        try {
-            const {name, iconsetId} = JSON.parse(str);
-            return new ImageId({name, iconsetId});
-        } catch (e) {
-            return null;
-        }
+        const [name, iconsetId] = str.split(separator);
+        return new ImageId({name, iconsetId});
     }
 
     static isEqual(a: ImageId | ImageIdSpec, b: ImageId | ImageIdSpec): boolean {
@@ -52,7 +50,7 @@ export class ImageId {
     }
 
     toString(): StringifiedImageId {
-        return JSON.stringify({name: this.name, iconsetId: this.iconsetId}) as StringifiedImageId;
+        return ImageId.toString(this);
     }
 
     serialize(): ImageIdSpec {

package/expression/types.ts

@@ -34,7 +34,7 @@ export type ResolvedImageTypeT = {
 
 export type EvaluationKind = 'constant' | 'source' | 'camera' | 'composite';
 
-export type Type = NullTypeT | NumberTypeT | StringTypeT | BooleanTypeT | ColorTypeT | ObjectTypeT | ValueTypeT | // eslint-disable-line no-use-before-define
+export type Type = NullTypeT | NumberTypeT | StringTypeT | BooleanTypeT | ColorTypeT | ObjectTypeT | ValueTypeT |
 ArrayType | ErrorTypeT | CollatorTypeT | FormattedTypeT | ResolvedImageTypeT;
 
 export type ArrayType = {

package/expression/values.ts

@@ -51,9 +51,7 @@ export function validateHSLA(h: unknown, s: unknown, l: unknown, a?: unknown): s
     return null;
 }
 
-export type Value = null | string | boolean | number | Color | Collator | Formatted | ResolvedImage | ReadonlyArray<Value> | {
-    readonly [key: string]: Value;
-};
+export type Value = null | string | boolean | number | Color | Collator | Formatted | ResolvedImage | ReadonlyArray<Value> | {readonly [key: string]: Value};
 
 export function isValue(mixed: unknown): boolean {
     if (mixed === null) {

package/feature_filter/index.ts

@@ -99,7 +99,7 @@ function createFilter(filter?: FilterSpecification, scope: string = "", options:
     let staticFilter = true;
     try {
         staticFilter = extractStaticFilter(filterExp);
-    } catch (e: any) {
+    } catch (e) {
         console.warn(
 `Failed to extract static filter. Filter will continue working, but at higher memory usage and slower framerate.
 This is most likely a bug, please report this via https://github.com/mapbox/mapbox-gl-js/issues/new?assignees=&labels=&template=Bug_report.md

package/function/index.ts

@@ -43,7 +43,7 @@ export function createFunction(parameters, propertySpec) {
         }
     }
 
-    if (parameters.colorSpace && parameters.colorSpace !== 'rgb' && !colorSpaces[parameters.colorSpace]) { // eslint-disable-line import/namespace
+    if (parameters.colorSpace && parameters.colorSpace !== 'rgb' && !colorSpaces[parameters.colorSpace]) {
         throw new Error(`Unknown color space: ${parameters.colorSpace}`);
     }
 
@@ -175,10 +175,10 @@ function evaluateExponentialFunction(parameters, propertySpec, input) {
 
     const outputLower = parameters.stops[index][1];
     const outputUpper = parameters.stops[index + 1][1];
-    let interp = interpolate[propertySpec.type] || identityFunction; // eslint-disable-line import/namespace
+    let interp = interpolate[propertySpec.type] || identityFunction;
 
     if (parameters.colorSpace && parameters.colorSpace !== 'rgb') {
-        const colorspace = colorSpaces[parameters.colorSpace]; // eslint-disable-line import/namespace
+        const colorspace = colorSpaces[parameters.colorSpace];
         interp = (a, b) => colorspace.reverse(colorspace.interpolate(colorspace.forward(a), colorspace.forward(b), t));
     }
 

package/migrate/expressions.ts

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

package/migrate/v8.ts

@@ -34,7 +34,7 @@ function renameProperty(obj, from, to) {
     obj[to] = obj[from]; delete obj[from];
 }
 
-export default function(style) {
+export default function (style) {
     style.version = 8;
 
     // Rename properties, reverse coordinates in source and layers

package/migrate/v9.ts

@@ -8,7 +8,7 @@ function eachLayer(style, callback) {
     }
 }
 
-export default function(style) {
+export default function (style) {
     style.version = 9;
 
     // remove user-specified refs

package/migrate.ts

@@ -17,7 +17,7 @@ import migrateToExpressions from './migrate/expressions';
  * var style = fs.readFileSync('./style.json', 'utf8');
  * fs.writeFileSync('./style.json', JSON.stringify(migrate(style)));
  */
-export default function(style) {
+export default function (style) {
     let migrated = false;
 
     if (style.version === 7) {

package/package.json

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

package/read_style.ts

@@ -1,15 +1,13 @@
-/* eslint-disable @typescript-eslint/ban-ts-comment */
-// @ts-nocheck
-
 import ParsingError from './error/parsing_error';
 import jsonlint from '@mapbox/jsonlint-lines-primitives';
 
-export default function readStyle(style) {
+import type {StyleSpecification} from './types';
+
+export default function readStyle(style: string | Buffer | StyleSpecification): StyleSpecification {
     if (style instanceof String || typeof style === 'string' || ArrayBuffer.isView(style)) {
         try {
-            // eslint-disable-next-line @typescript-eslint/no-base-to-string
             return jsonlint.parse(style.toString());
-        } catch (e: any) {
+        } catch (e) {
             throw new ParsingError(e);
         }
     }