@mapbox/mapbox-gl-style-spec 14.26.0 → 14.27.0-rc.1

package/expression/definitions/number_format.ts

@@ -61,13 +61,13 @@ export default class NumberFormat implements Expression {
         }
 
         let minFractionDigits = null;
-        if (options['min-fraction-digits']) {
+        if (options['min-fraction-digits'] !== undefined) {
             minFractionDigits = context.parseObjectValue(options['min-fraction-digits'], 2, 'min-fraction-digits', NumberType);
             if (!minFractionDigits) return null;
         }
 
         let maxFractionDigits = null;
-        if (options['max-fraction-digits']) {
+        if (options['max-fraction-digits'] !== undefined) {
             maxFractionDigits = context.parseObjectValue(options['max-fraction-digits'], 2, 'max-fraction-digits', NumberType);
             if (!maxFractionDigits) return null;
         }

package/expression/index.ts

@@ -164,7 +164,7 @@ export class StyleExpression {
 
 export function isExpression(expression: unknown): boolean {
     return Array.isArray(expression) && expression.length > 0 &&
-        typeof expression[0] === 'string' && expression[0] in definitions;
+        typeof expression[0] === 'string' && Object.hasOwn(definitions, expression[0]);
 }
 
 /**

package/expression/parsing_context.ts

@@ -144,7 +144,7 @@ class ParsingContext {
                 return this.error(`Expected an array with at least one element. If you wanted a literal array, use ["literal", []].`);
             }
 
-            const Expr = typeof expr[0] === 'string' ? this.registry[expr[0]] : undefined;
+            const Expr = typeof expr[0] === 'string' && Object.hasOwn(this.registry, expr[0]) ? this.registry[expr[0]] : undefined;
             if (Expr) {
                 let parsed = Expr.parse(expr, this);
                 if (!parsed) return null;

package/expression/scope.ts

@@ -6,12 +6,10 @@ import type {Expression} from './expression';
  */
 class Scope {
     parent: Scope | null | undefined;
-    bindings: {
-        [_: string]: Expression;
-    };
+    bindings: Record<string, Expression>;
     constructor(parent?: Scope, bindings: Array<[string, Expression]> = []) {
         this.parent = parent;
-        this.bindings = {};
+        this.bindings = Object.create(null) as Record<string, Expression>;
         for (const [name, expression] of bindings) {
             this.bindings[name] = expression;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mapbox/mapbox-gl-style-spec",
-  "version": "14.26.0",
+  "version": "14.27.0-rc.1",
   "description": "a specification for mapbox gl styles",
   "author": "Mapbox",
   "license": "SEE LICENSE IN LICENSE.txt",
@@ -32,7 +32,7 @@
     "pretest": "npm run build",
     "test": "node ./test.js",
     "build": "npm run build-spec && npm run build-dts",
-    "build-dts": "dts-bundle-generator --no-banner --export-referenced-types=false --project ../../tsconfig.browser.json -o ./dist/index.d.ts ./style-spec.ts",
+    "build-dts": "rollup -c rollup.config.dts.ts",
     "build-spec": "rollup -c && rollup -c --environment esm",
     "prepublishOnly": "npm run build",
     "postpublish": "rm dist/index.cjs dist/index.d.ts"

package/rollup.config.dts.ts

@@ -0,0 +1,17 @@
+import {dts} from 'rollup-plugin-dts';
+
+import type {RollupOptions} from 'rollup';
+
+// Bundles the style-spec type declarations into a single `dist/index.d.ts`.
+// Unlike the main library, style-spec has real runtime `dependencies`, so their
+// types stay external `import`s (consumers install them) rather than being inlined.
+export default (): RollupOptions => ({
+    input: './style-spec.ts',
+    output: {
+        file: './dist/index.d.ts',
+        format: 'es',
+    },
+    plugins: [
+        dts({tsconfig: '../../tsconfig.browser.json'}),
+    ],
+});

package/validate/validate_import.ts

@@ -43,11 +43,11 @@ export default function validateImport(options: ImportValidatorOptions): Validat
         errors.push(new ValidationError(key, importSpec, `import id can't be an empty string`));
     }
 
-    // Reject reserved prototype-pollution key — the import id is used as a scope
-    // string that becomes a dictionary key in several runtime caches.
-    if (unbundle(importSpec.id) === '__proto__') {
+    // Reject reserved prototype-pollution keys
+    const importId = unbundle(importSpec.id);
+    if (importId === '__proto__' || importId === 'constructor' || importId === 'prototype') {
         const key = `${options.key}.id`;
-        errors.push(new ValidationError(key, importSpec, `import id can't be "__proto__"`));
+        errors.push(new ValidationError(key, importSpec, `import id can't be "${String(importId)}"`));
     }
 
     if (data) {