@mapbox/mapbox-gl-style-spec 14.23.0 → 14.24.0-rc.1

package/dist/index.cjs

@@ -8184,6 +8184,26 @@
   			]
   		},
   		"property-type": "data-constant"
+  	},
+  	"line-blend-additive-clamp": {
+  		type: "number",
+  		"default": 0,
+  		minimum: 0,
+  		doc: "Controls the brightness of lines in additive blend mode. When set to 0 (the default), brightness is adjusted automatically based on the density of lines visible on screen. Increase this value if the lines appear too bright, or decrease it if they appear too faint.",
+  		experimental: true,
+  		"private": true,
+  		"sdk-support": {
+  			"basic functionality": {
+  				js: "3.21.0"
+  			}
+  		},
+  		expression: {
+  			interpolated: true,
+  			parameters: [
+  				"zoom"
+  			]
+  		},
+  		"property-type": "data-constant"
   	}
   };
   var paint_circle = {
@@ -13553,21 +13573,6 @@
   function number(a, b, t) {
       return a * (1 - t) + b * t;
   }
-  function color(from, to, t) {
-      return new Color(number(from.r, to.r, t), number(from.g, to.g, t), number(from.b, to.b, t), number(from.a, to.a, t));
-  }
-  function array(from, to, t) {
-      return from.map((d, i) => {
-          return number(d, to[i], t);
-      });
-  }
-
-  var interpolate$1 = /*#__PURE__*/Object.freeze({
-    __proto__: null,
-    array: array,
-    color: color,
-    number: number
-  });
 
   class Color {
       constructor(r, g, b, a = 1) {
@@ -13607,12 +13612,7 @@
      * translucentGreen.toString(); // = "rgba(26,207,26,0.73)"
      */
       toString() {
-          const [r, g, b, a] = [
-              this.r,
-              this.g,
-              this.b,
-              this.a
-          ];
+          const {r, g, b, a} = this;
           return `rgba(${ Math.round(r * 255) },${ Math.round(g * 255) },${ Math.round(b * 255) },${ a })`;
       }
       toNonPremultipliedRenderColor(lut) {
@@ -13939,7 +13939,10 @@
           return JSON.stringify(this);
       }
       static parse(str) {
-          let id, params, sx, sy;
+          let id;
+          let params;
+          let sx;
+          let sy;
           try {
               ({id, params, sx, sy} = JSON.parse(str) || {});
           } catch (e) {
@@ -14321,7 +14324,7 @@
                       if (!textColor)
                           return null;
                   }
-                  const lastExpression = sections[sections.length - 1];
+                  const lastExpression = sections.at(-1);
                   lastExpression.scale = scale;
                   lastExpression.font = font;
                   lastExpression.textColor = textColor;
@@ -14463,7 +14466,7 @@
                           }
                           parsedParams[key] = value;
                       }
-                      imageExpression[imageExpression.length - 1].options.params = parsedParams;
+                      imageExpression.at(-1).options.params = parsedParams;
                   }
                   if (iconset) {
                       if (typeof iconset !== 'object' || iconset.constructor !== Object) {
@@ -14474,7 +14477,7 @@
                           optionsContext.error(`Image options "iconset" should have an "id" property`);
                           return false;
                       }
-                      imageExpression[imageExpression.length - 1].options.iconset = iconset;
+                      imageExpression.at(-1).options.iconset = iconset;
                   }
                   nextArgId++;
                   return true;
@@ -14880,7 +14883,11 @@
                   continue;
               overloadParams.push(params);
               overloadIndex++;
-              signatureContext = new ParsingContext(context.registry, context.path, null, context.scope, void 0, context._scope, context.options, context.iconImageUseTheme);
+              if (signatureContext === null) {
+                  signatureContext = new ParsingContext(context.registry, context.path, null, context.scope, [], context._scope, context.options, context.iconImageUseTheme);
+              } else {
+                  signatureContext.errors.length = 0;
+              }
               const parsedArgs = [];
               let argParseFailed = false;
               for (let i = 1; i < args.length; i++) {
@@ -14905,7 +14912,7 @@
               for (let i = 0; i < parsedArgs.length; i++) {
                   const expected = Array.isArray(params) ? params[i] : params.type;
                   const arg = parsedArgs[i];
-                  signatureContext.concat(i + 1).checkSubtype(expected, arg.type);
+                  signatureContext.checkSubtype(expected, arg.type, i + 1);
               }
               if (signatureContext.errors.length === 0) {
                   return new CompoundExpression(op, type, evaluate, parsedArgs, overloadIndex);
@@ -15879,7 +15886,7 @@
               const d = this.distance(p0, p1);
               sum += d;
               if (sum > dist)
-                  return interpolate(p0, p1, (dist - (sum - d)) / d);
+                  return interpolate$1(p0, p1, (dist - (sum - d)) / d);
           }
           return line[line.length - 1];
       }
@@ -16018,10 +16025,10 @@
               const d = this.distance(p0, p1);
               sum += d;
               if (sum > start && slice.length === 0) {
-                  slice.push(interpolate(p0, p1, (start - (sum - d)) / d));
+                  slice.push(interpolate$1(p0, p1, (start - (sum - d)) / d));
               }
               if (sum >= stop) {
-                  slice.push(interpolate(p0, p1, (stop - (sum - d)) / d));
+                  slice.push(interpolate$1(p0, p1, (stop - (sum - d)) / d));
                   return slice;
               }
               if (sum > start)
@@ -16097,7 +16104,7 @@
    * @param {number} t
    * @returns {[number, number]}
    */
-  function interpolate(a, b, t) {
+  function interpolate$1(a, b, t) {
       const dx = wrap(b[0] - a[0]);
       const dy = b[1] - a[1];
       return [
@@ -16791,7 +16798,7 @@
               return false;
           } else if (e.name === 'properties' || e.name === 'geometry-type' || e.name === 'id') {
               return false;
-          } else if (/^filter-/.test(e.name)) {
+          } else if (e.name.startsWith('filter-')) {
               return false;
           }
       }
@@ -16827,7 +16834,7 @@
       return result;
   }
   function isGlobalPropertyConstant(e, properties) {
-      if (e instanceof CompoundExpression && properties.indexOf(e.name) >= 0) {
+      if (e instanceof CompoundExpression && properties.includes(e.name)) {
           return false;
       }
       let result = true;
@@ -17007,12 +17014,6 @@
       constructor(registry, path = [], expectedType, scope = new Scope(), errors = [], _scope, options, iconImageUseTheme) {
           this.registry = registry;
           this.path = path;
-          this.key = path.map(part => {
-              if (typeof part === 'string') {
-                  return `['${ part }']`;
-              }
-              return `[${ part }]`;
-          }).join('');
           this.scope = scope;
           this.errors = errors;
           this.expectedType = expectedType;
@@ -17020,6 +17021,18 @@
           this.options = options;
           this.iconImageUseTheme = iconImageUseTheme;
       }
+      get key() {
+          if (this._key === void 0) {
+              const path = this.path;
+              let key = '';
+              for (let i = 0; i < path.length; i++) {
+                  const part = path[i];
+                  key += typeof part === 'string' ? `['${ part }']` : `[${ part }]`;
+              }
+              this._key = key;
+          }
+          return this._key;
+      }
       /**
      * @param expr the JSON expression to parse
      * @param index the optional argument index if this expression is an argument of a parent expression that's being parsed
@@ -17132,10 +17145,10 @@
      * Returns null if `t` is a subtype of `expected`; otherwise returns an
      * error message and also pushes it to `this.errors`.
      */
-      checkSubtype(expected, t) {
+      checkSubtype(expected, t, index) {
           const error = checkSubtype(expected, t);
           if (error)
-              this.error(error);
+              this.error(error, ...typeof index === 'number' ? [index] : []);
           return error;
       }
   }
@@ -17187,7 +17200,8 @@
       let lowerIndex = 0;
       let upperIndex = lastIndex;
       let currentIndex = 0;
-      let currentValue, nextValue;
+      let currentValue;
+      let nextValue;
       while (lowerIndex <= upperIndex) {
           currentIndex = Math.floor((lowerIndex + upperIndex) / 2);
           currentValue = stops[currentIndex];
@@ -17240,7 +17254,7 @@
               if (typeof label !== 'number') {
                   return context.error('Input/output pairs for "step" expressions must be defined using literal numeric values (not computed expressions) for the input values.', labelKey);
               }
-              if (stops.length && stops[stops.length - 1][0] >= label) {
+              if (stops.length && stops.at(-1)[0] >= label) {
                   return context.error('Input/output pairs for "step" expressions must be arranged with input values in strictly ascending order.', labelKey);
               }
               const parsed = context.parse(value, valueKey, outputType);
@@ -17372,6 +17386,22 @@
   var unitbezierExports = requireUnitbezier();
   var UnitBezier = /*@__PURE__*/getDefaultExportFromCjs(unitbezierExports);
 
+  function color(from, to, t) {
+      return new Color(number(from.r, to.r, t), number(from.g, to.g, t), number(from.b, to.b, t), number(from.a, to.a, t));
+  }
+  function array(from, to, t) {
+      return from.map((d, i) => {
+          return number(d, to[i], t);
+      });
+  }
+
+  var interpolate = /*#__PURE__*/Object.freeze({
+    __proto__: null,
+    array: array,
+    color: color,
+    number: number
+  });
+
   const Xn = 0.95047, Yn = 1, Zn = 1.08883, t0 = 4 / 29, t1 = 6 / 29, t2 = 3 * t1 * t1, t3 = t1 * t1 * t1, deg2rad = Math.PI / 180, rad2deg = 180 / Math.PI;
   function xyz2lab(t) {
       return t > t3 ? Math.pow(t, 1 / 3) : t / t2 + t0;
@@ -17536,7 +17566,7 @@
               if (typeof label !== 'number') {
                   return context.error('Input/output pairs for "interpolate" expressions must be defined using literal numeric values (not computed expressions) for the input values.', labelKey);
               }
-              if (stops.length && stops[stops.length - 1][0] >= label) {
+              if (stops.length && stops.at(-1)[0] >= label) {
                   return context.error('Input/output pairs for "interpolate" expressions must be arranged with input values in strictly ascending order.', labelKey);
               }
               const parsed = context.parse(value, valueKey, outputType);
@@ -17574,7 +17604,7 @@
           const outputLower = outputs[index].evaluate(ctx);
           const outputUpper = outputs[index + 1].evaluate(ctx);
           if (this.operator === 'interpolate') {
-              return interpolate$1[this.type.kind.toLowerCase()](outputLower, outputUpper, t);
+              return interpolate[this.type.kind.toLowerCase()](outputLower, outputUpper, t);
           } else if (this.operator === 'interpolate-hcl') {
               return hcl.reverse(hcl.interpolate(hcl.forward(outputLower), hcl.forward(outputUpper), t));
           } else {
@@ -17695,6 +17725,7 @@
       }
   }
 
+  const INVALID_VAR_CHAR_RE = /[^a-zA-Z0-9_]/;
   class Let {
       constructor(bindings, result) {
           this.type = result.type;
@@ -17720,7 +17751,7 @@
               if (typeof name !== 'string') {
                   return context.error(`Expected string, but found ${ typeof name } instead.`, i);
               }
-              if (/[^a-zA-Z0-9_]/.test(name)) {
+              if (INVALID_VAR_CHAR_RE.test(name)) {
                   return context.error(`Variable names must contain only alphanumeric characters or '_'.`, i);
               }
               const value = context.parse(args[i + 1], i + 1);
@@ -17731,7 +17762,7 @@
                   value
               ]);
           }
-          const result = context.parse(args[args.length - 1], args.length - 1, context.expectedType, bindings);
+          const result = context.parse(args.at(-1), args.length - 1, context.expectedType, bindings);
           if (!result)
               return null;
           return new Let(bindings, result);
@@ -17895,7 +17926,7 @@
               ])) {
               throw new RuntimeError(`Expected second argument to be of type array or string, but found ${ toString$1(typeOf(haystack)) } instead.`);
           }
-          return haystack.indexOf(needle) >= 0;
+          return haystack.includes(needle);
       }
       eachChild(fn) {
           fn(this.needle);
@@ -18057,7 +18088,7 @@
           const input = context.parse(args[1], 1, ValueType);
           if (!input)
               return null;
-          const otherwise = context.parse(args[args.length - 1], args.length - 1, outputType);
+          const otherwise = context.parse(args.at(-1), args.length - 1, outputType);
           if (!otherwise)
               return null;
           if (input.type.kind !== 'value' && context.concat(1).checkSubtype(inputType, input.type)) {
@@ -18146,7 +18177,7 @@
               ]);
               outputType = outputType || result.type;
           }
-          const otherwise = context.parse(args[args.length - 1], args.length - 1, outputType);
+          const otherwise = context.parse(args.at(-1), args.length - 1, outputType);
           if (!otherwise)
               return null;
           return new Case(outputType, branches, otherwise);
@@ -19183,14 +19214,14 @@
       'filter-type-in': [
           BooleanType,
           [array$1(StringType)],
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-          (ctx, [v]) => v.value.indexOf(ctx.geometryType()) >= 0
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-return
+          (ctx, [v]) => v.value.includes(ctx.geometryType())
       ],
       'filter-id-in': [
           BooleanType,
           [array$1(ValueType)],
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-          (ctx, [v]) => v.value.indexOf(ctx.id()) >= 0
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-return
+          (ctx, [v]) => v.value.includes(ctx.id())
       ],
       'filter-in-small': [
           BooleanType,
@@ -19199,8 +19230,8 @@
               array$1(ValueType)
           ],
           // assumes v is an array literal
-          // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
-          (ctx, [k, v]) => v.value.indexOf(ctx.properties()[k.value]) >= 0
+          // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-return
+          (ctx, [k, v]) => v.value.includes(ctx.properties()[k.value])
       ],
       'filter-in-large': [
           BooleanType,
@@ -19371,8 +19402,10 @@
       };
   }
 
+  const TRANSITION_KEY_RE = /^(.*)-transition$/;
+  const USE_THEME_KEY_RE = /^(.*)-use-theme$/;
   function expressionHasParameter(expression, parameter) {
-      return !!expression && !!expression.parameters && expression.parameters.indexOf(parameter) > -1;
+      return !!expression && !!expression.parameters && expression.parameters.includes(parameter);
   }
   function supportsPropertyExpression(spec) {
       return spec['property-type'] === 'data-driven';
@@ -19500,7 +19533,7 @@
               interpolationFactor: Interpolate.interpolationFactor.bind(void 0, interpolationType),
               // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
               zoomStops: parameters.stops.map(s => s[0]),
-              // eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-unsafe-call
+              // eslint-disable-next-line @typescript-eslint/no-unsafe-return
               evaluate: ({zoom}) => innerFun(parameters, propertySpec, zoom, hashedStops, categoricalKeyType)
           };
       } else {
@@ -19558,7 +19591,7 @@
       parameters.stops[index + 1][0]);
       const outputLower = parameters.stops[index][1];
       const outputUpper = parameters.stops[index + 1][1];
-      let interp = interpolate$1[propertySpec.type] || identityFunction;
+      let interp = interpolate[propertySpec.type] || identityFunction;
       if (parameters.colorSpace && parameters.colorSpace !== 'rgb') {
           const colorspace = colorSpaces[parameters.colorSpace];
           interp = (a, b) => colorspace.reverse(colorspace.interpolate(colorspace.forward(a), colorspace.forward(b), t));
@@ -20289,13 +20322,13 @@ ${ JSON.stringify(filterExp, null, 2) }
               isBranchingDynamically = isBranchingDynamically || isDynamicFilter(filter[i]);
               branches.push(filter[i + 1]);
           }
-          branches.push(filter[filter.length - 1]);
+          branches.push(filter.at(-1));
       } else if (filter[0] === 'match') {
           isBranchingDynamically = isBranchingDynamically || isDynamicFilter(filter[1]);
           for (let i = 2; i < filter.length - 1; i += 2) {
               branches.push(filter[i + 1]);
           }
-          branches.push(filter[filter.length - 1]);
+          branches.push(filter.at(-1));
       } else if (filter[0] === 'step') {
           isBranchingDynamically = isBranchingDynamically || isDynamicFilter(filter[1]);
           for (let i = 1; i < filter.length - 1; i += 2) {
@@ -20695,6 +20728,7 @@ ${ JSON.stringify(filterExp, null, 2) }
       return style;
   }
 
+  const MAPBOX_URL_RE = /^mapbox:\/\/(.*)/;
   function composite (style) {
       const styleIDs = [];
       const sourceIDs = [];
@@ -20703,7 +20737,7 @@ ${ JSON.stringify(filterExp, null, 2) }
           const source = style.sources[id];
           if (source.type !== 'vector')
               continue;
-          const match = /^mapbox:\/\/(.*)/.exec(source.url);
+          const match = MAPBOX_URL_RE.exec(source.url);
           if (!match)
               continue;
           styleIDs.push(id);
@@ -20720,10 +20754,10 @@ ${ JSON.stringify(filterExp, null, 2) }
           'url': `mapbox://${ compositeID }`
       };
       style.layers.forEach(layer => {
-          if (styleIDs.indexOf(layer.source) >= 0) {
+          if (styleIDs.includes(layer.source)) {
               layer.source = compositeID;
               if ('source-layer' in layer) {
-                  if (compositedSourceLayers.indexOf(layer['source-layer']) >= 0) {
+                  if (compositedSourceLayers.includes(layer['source-layer'])) {
                       throw new Error('Conflicting source layer names');
                   } else {
                       compositedSourceLayers.push(layer['source-layer']);
@@ -20954,14 +20988,14 @@ ${ JSON.stringify(filterExp, null, 2) }
   function canUpdateGeoJSON(before, after, sourceId) {
       let prop;
       for (prop in before[sourceId]) {
-          if (!before[sourceId].hasOwnProperty(prop))
+          if (!Object.hasOwn(before[sourceId], prop))
               continue;
           if (prop !== 'data' && !deepEqual(before[sourceId][prop], after[sourceId][prop])) {
               return false;
           }
       }
       for (prop in after[sourceId]) {
-          if (!after[sourceId].hasOwnProperty(prop))
+          if (!Object.hasOwn(after[sourceId], prop))
               continue;
           if (prop !== 'data' && !deepEqual(before[sourceId][prop], after[sourceId][prop])) {
               return false;
@@ -20974,17 +21008,17 @@ ${ JSON.stringify(filterExp, null, 2) }
       after = after || {};
       let sourceId;
       for (sourceId in before) {
-          if (!before.hasOwnProperty(sourceId))
+          if (!Object.hasOwn(before, sourceId))
               continue;
-          if (!after.hasOwnProperty(sourceId)) {
+          if (!Object.hasOwn(after, sourceId)) {
               removeSource(sourceId, commands, sourcesRemoved);
           }
       }
       for (sourceId in after) {
-          if (!after.hasOwnProperty(sourceId))
+          if (!Object.hasOwn(after, sourceId))
               continue;
           const source = after[sourceId];
-          if (!before.hasOwnProperty(sourceId)) {
+          if (!Object.hasOwn(before, sourceId)) {
               addSource(sourceId, after, commands);
           } else if (!deepEqual(before[sourceId], source)) {
               if (before[sourceId].type === 'geojson' && source.type === 'geojson' && canUpdateGeoJSON(before, after, sourceId)) {
@@ -21006,7 +21040,7 @@ ${ JSON.stringify(filterExp, null, 2) }
       after = after || {};
       let prop;
       for (prop in before) {
-          if (!before.hasOwnProperty(prop))
+          if (!Object.hasOwn(before, prop))
               continue;
           if (!deepEqual(before[prop], after[prop])) {
               commands.push({
@@ -21021,7 +21055,7 @@ ${ JSON.stringify(filterExp, null, 2) }
           }
       }
       for (prop in after) {
-          if (!after.hasOwnProperty(prop) || before.hasOwnProperty(prop))
+          if (!Object.hasOwn(after, prop) || Object.hasOwn(before, prop))
               continue;
           if (!deepEqual(before[prop], after[prop])) {
               commands.push({
@@ -21053,10 +21087,16 @@ ${ JSON.stringify(filterExp, null, 2) }
       const tracker = beforeOrder.slice();
       const clean = /* @__PURE__ */
       Object.create(null);
-      let i, d, layerId, beforeLayer, afterLayer, insertBeforeLayerId, prop;
+      let i;
+      let d;
+      let layerId;
+      let beforeLayer;
+      let afterLayer;
+      let insertBeforeLayerId;
+      let prop;
       for (i = 0, d = 0; i < beforeOrder.length; i++) {
           layerId = beforeOrder[i];
-          if (!afterIndex.hasOwnProperty(layerId)) {
+          if (!Object.hasOwn(afterIndex, layerId)) {
               commands.push({
                   command: operations.removeLayer,
                   args: [layerId]
@@ -21070,7 +21110,7 @@ ${ JSON.stringify(filterExp, null, 2) }
           layerId = afterOrder[afterOrder.length - 1 - i];
           if (tracker[tracker.length - 1 - i] === layerId)
               continue;
-          if (beforeIndex.hasOwnProperty(layerId)) {
+          if (Object.hasOwn(beforeIndex, layerId)) {
               commands.push({
                   command: operations.removeLayer,
                   args: [layerId]
@@ -21142,7 +21182,7 @@ ${ JSON.stringify(filterExp, null, 2) }
               });
           }
           for (prop in beforeLayer) {
-              if (!beforeLayer.hasOwnProperty(prop))
+              if (!Object.hasOwn(beforeLayer, prop))
                   continue;
               if (prop === 'layout' || prop === 'paint' || prop === 'filter' || prop === 'metadata' || prop === 'minzoom' || prop === 'maxzoom' || prop === 'slot')
                   continue;
@@ -21160,7 +21200,7 @@ ${ JSON.stringify(filterExp, null, 2) }
               }
           }
           for (prop in afterLayer) {
-              if (!afterLayer.hasOwnProperty(prop) || beforeLayer.hasOwnProperty(prop))
+              if (!Object.hasOwn(afterLayer, prop) || Object.hasOwn(beforeLayer, prop))
                   continue;
               if (prop === 'layout' || prop === 'paint' || prop === 'filter' || prop === 'metadata' || prop === 'minzoom' || prop === 'maxzoom' || prop === 'slot')
                   continue;
@@ -21187,10 +21227,13 @@ ${ JSON.stringify(filterExp, null, 2) }
       const beforeIndex = before.reduce(indexById, {});
       const afterIndex = after.reduce(indexById, {});
       const tracker = beforeOrder.slice();
-      let i, d, importId, insertBefore;
+      let i;
+      let d;
+      let importId;
+      let insertBefore;
       for (i = 0, d = 0; i < beforeOrder.length; i++) {
           importId = beforeOrder[i];
-          if (!afterIndex.hasOwnProperty(importId)) {
+          if (!Object.hasOwn(afterIndex, importId)) {
               commands.push({
                   command: operations.removeImport,
                   args: [importId]
@@ -21204,7 +21247,7 @@ ${ JSON.stringify(filterExp, null, 2) }
           importId = afterOrder[afterOrder.length - 1 - i];
           if (tracker[tracker.length - 1 - i] === importId)
               continue;
-          if (beforeIndex.hasOwnProperty(importId)) {
+          if (Object.hasOwn(beforeIndex, importId)) {
               commands.push({
                   command: operations.removeImport,
                   args: [importId]
@@ -21244,9 +21287,9 @@ ${ JSON.stringify(filterExp, null, 2) }
       after = after || {};
       let iconsetId;
       for (iconsetId in before) {
-          if (!before.hasOwnProperty(iconsetId))
+          if (!Object.hasOwn(before, iconsetId))
               continue;
-          if (!after.hasOwnProperty(iconsetId)) {
+          if (!Object.hasOwn(after, iconsetId)) {
               commands.push({
                   command: operations.removeIconset,
                   args: [iconsetId]
@@ -21254,10 +21297,10 @@ ${ JSON.stringify(filterExp, null, 2) }
           }
       }
       for (iconsetId in after) {
-          if (!after.hasOwnProperty(iconsetId))
+          if (!Object.hasOwn(after, iconsetId))
               continue;
           const iconset = after[iconsetId];
-          if (!before.hasOwnProperty(iconsetId)) {
+          if (!Object.hasOwn(before, iconsetId)) {
               commands.push({
                   command: operations.addIconset,
                   args: [
@@ -21447,11 +21490,12 @@ ${ JSON.stringify(filterExp, null, 2) }
   class ValidationWarning extends ValidationError {
   }
 
+  const LINE_NUMBER_RE = /line (\d+)/;
   class ParsingError {
       constructor(error) {
           this.error = error;
           this.message = error.message;
-          const match = error.message.match(/line (\d+)/);
+          const match = error.message.match(LINE_NUMBER_RE);
           this.line = match ? parseInt(match[1], 10) : 0;
       }
   }
@@ -21849,11 +21893,11 @@ ${ JSON.stringify(filterExp, null, 2) }
       const valueSpec = options.valueSpec;
       const errors = [];
       if (Array.isArray(valueSpec.values)) {
-          if (valueSpec.values.indexOf(unbundle(value)) === -1) {
+          if (!valueSpec.values.includes(unbundle(value))) {
               errors.push(new ValidationError(key, value, `expected one of [${ valueSpec.values.join(', ') }], ${ JSON.stringify(value) } found`));
           }
       } else {
-          if (Object.keys(valueSpec.values).indexOf(unbundle(value)) === -1) {
+          if (!Object.keys(valueSpec.values).includes(unbundle(value))) {
               errors.push(new ValidationError(key, value, `expected one of [${ Object.keys(valueSpec.values).join(', ') }], ${ JSON.stringify(value) } found`));
           }
       }
@@ -21955,6 +21999,7 @@ ${ JSON.stringify(filterExp, null, 2) }
       return errors;
   }
 
+  const TOKEN_PATTERN_RE = /^{([^}]+)}$/;
   function validateProperty(options, propertyType) {
       const key = options.key;
       const style = options.style;
@@ -21965,7 +22010,7 @@ ${ JSON.stringify(filterExp, null, 2) }
       const layerSpec = styleSpec[`${ propertyType }_${ options.layerType }`];
       if (!layerSpec)
           return [];
-      const useThemeMatch = propertyKey.match(/^(.*)-use-theme$/);
+      const useThemeMatch = propertyKey.match(USE_THEME_KEY_RE);
       if (useThemeMatch && layerSpec[useThemeMatch[1]]) {
           if (isExpression(deepUnbundle(value))) {
               const errors2 = [];
@@ -21998,7 +22043,7 @@ ${ JSON.stringify(filterExp, null, 2) }
               styleSpec
           });
       }
-      const transitionMatch = propertyKey.match(/^(.*)-transition$/);
+      const transitionMatch = propertyKey.match(TRANSITION_KEY_RE);
       if (propertyType === 'paint' && transitionMatch && layerSpec[transitionMatch[1]] && layerSpec[transitionMatch[1]].transition) {
           return validate({
               key,
@@ -22014,7 +22059,7 @@ ${ JSON.stringify(filterExp, null, 2) }
           return [new ValidationWarning(key, value, `unknown property "${ propertyKey }"`)];
       }
       let tokenMatch;
-      if (isString(value) && supportsPropertyExpression(valueSpec) && !valueSpec.tokens && (tokenMatch = /^{([^}]+)}$/.exec(value))) {
+      if (isString(value) && supportsPropertyExpression(valueSpec) && !valueSpec.tokens && (tokenMatch = TOKEN_PATTERN_RE.exec(value))) {
           const example = `\`{ "type": "identity", "property": ${ tokenMatch ? JSON.stringify(tokenMatch[1]) : '"_"' } }\``;
           return [new ValidationError(key, value, `"${ propertyKey }" does not support interpolation syntax
 Use an identity property function instead: ${ example }.`)];
@@ -22027,7 +22072,7 @@ Use an identity property function instead: ${ example }.`)];
           if (propertyKey === 'text-font' && isFunction(deepUnbundle(value)) && unbundle(value.type) === 'identity') {
               errors.push(new ValidationError(key, value, '"text-font" does not support identity functions'));
           }
-      } else if (options.layerType === 'model' && propertyType === 'paint' && layer && layer.layout && layer.layout.hasOwnProperty('model-id')) {
+      } else if (options.layerType === 'model' && propertyType === 'paint' && layer && layer.layout && Object.hasOwn(layer.layout, 'model-id')) {
           if (supportsPropertyExpression(valueSpec) && (supportsLightExpression(valueSpec) || supportsZoomExpression(valueSpec))) {
               const expression = createPropertyExpression(deepUnbundle(value), valueSpec);
               const expressionValue = expression.value;
@@ -22195,8 +22240,10 @@ Use an identity property function instead: ${ example }.`)];
                       'raster-particle'
                   ].includes(type)) {
                   errors.push(new ValidationError(key, layer.source, `raster-array source can only be used with layer type 'raster'.`));
-              } else if (type === 'line' && layer.paint && (layer.paint['line-gradient'] || layer.paint['line-trim-offset']) && (sourceType === 'geojson' && !source.lineMetrics)) {
+              } else if (type === 'line' && layer.paint && layer.paint['line-gradient'] && (sourceType === 'geojson' && !source.lineMetrics)) {
                   errors.push(new ValidationError(key, layer, `layer "${ layer.id }" specifies a line-gradient, which requires the GeoJSON source to have \`lineMetrics\` enabled.`));
+              } else if (type === 'line' && layer.paint && layer.paint['line-trim-offset'] && (sourceType === 'geojson' && !source.lineMetrics)) {
+                  errors.push(new ValidationError(key, layer, `layer "${ layer.id }" specifies a line-trim-offset, which requires the GeoJSON source to have \`lineMetrics\` enabled.`));
               } else if (type === 'raster-particle' && sourceType !== 'raster-array') {
                   errors.push(new ValidationError(key, layer.source, `layer "${ layer.id }" requires a 'raster-array' source.`));
               }
@@ -22471,7 +22518,7 @@ Use an identity property function instead: ${ example }.`)];
   }
 
   function isValidUrl(str, allowRelativeUrls) {
-      const isRelative = str.indexOf('://') === -1;
+      const isRelative = !str.includes('://');
       try {
           new URL(str, isRelative && allowRelativeUrls ? 'http://example.com' : void 0);
           return true;
@@ -22506,8 +22553,8 @@ Use an identity property function instead: ${ example }.`)];
       }
       let errors = [];
       for (const key in light) {
-          const transitionMatch = key.match(/^(.*)-transition$/);
-          const useThemeMatch = key.match(/^(.*)-use-theme$/);
+          const transitionMatch = key.match(TRANSITION_KEY_RE);
+          const useThemeMatch = key.match(USE_THEME_KEY_RE);
           if (useThemeMatch && lightSpec[useThemeMatch[1]]) {
               errors = errors.concat(validate({
                   key,
@@ -22591,8 +22638,8 @@ Use an identity property function instead: ${ example }.`)];
                   return errors;
               }
               for (const propertyKey in properties) {
-                  const transitionMatch = propertyKey.match(/^(.*)-transition$/);
-                  const useThemeMatch = propertyKey.match(/^(.*)-use-theme$/);
+                  const transitionMatch = propertyKey.match(TRANSITION_KEY_RE);
+                  const useThemeMatch = propertyKey.match(USE_THEME_KEY_RE);
                   if (useThemeMatch && lightPropertySpec[useThemeMatch[1]]) {
                       errors = errors.concat(validate({
                           key: key2,
@@ -22655,8 +22702,8 @@ Use an identity property function instead: ${ example }.`)];
       }
       let errors = [];
       for (const key2 in terrain) {
-          const transitionMatch = key2.match(/^(.*)-transition$/);
-          const useThemeMatch = key2.match(/^(.*)-use-theme$/);
+          const transitionMatch = key2.match(TRANSITION_KEY_RE);
+          const useThemeMatch = key2.match(USE_THEME_KEY_RE);
           if (useThemeMatch && terrainSpec[useThemeMatch[1]]) {
               errors = errors.concat(validate({
                   key: key2,
@@ -22716,8 +22763,8 @@ Use an identity property function instead: ${ example }.`)];
       }
       let errors = [];
       for (const key in fog) {
-          const transitionMatch = key.match(/^(.*)-transition$/);
-          const useThemeMatch = key.match(/^(.*)-use-theme$/);
+          const transitionMatch = key.match(TRANSITION_KEY_RE);
+          const useThemeMatch = key.match(USE_THEME_KEY_RE);
           if (useThemeMatch && fogSpec[useThemeMatch[1]]) {
               errors = errors.concat(validate({
                   key,
@@ -22906,7 +22953,6 @@ Use an identity property function instead: ${ example }.`)];
           errors = errors.concat(validateElement({
               key: (key ? `${ key }.` : key) + objectKey,
               value: object[objectKey],
-              // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
               valueSpec: elementSpec,
               style,
               styleSpec,
@@ -22934,10 +22980,10 @@ Use an identity property function instead: ${ example }.`)];
       if (errors.length)
           return errors;
       const str = value;
-      if (str.indexOf('{fontstack}') === -1) {
+      if (!str.includes('{fontstack}')) {
           errors.push(new ValidationError(key, value, '"glyphs" url must include a "{fontstack}" token'));
       }
-      if (str.indexOf('{range}') === -1) {
+      if (!str.includes('{range}')) {
           errors.push(new ValidationError(key, value, '"glyphs" url must include a "{range}" token'));
       }
       return errors;
@@ -22948,7 +22994,7 @@ Use an identity property function instead: ${ example }.`)];
           key: options.key || '',
           value: style,
           // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
-          valueSpec: Object.assign(styleSpec.$root, // Skip validation of the root properties that are not defined in the style spec (e.g. 'owner').
+          valueSpec: Object.assign({}, styleSpec.$root, // Skip validation of the root properties that are not defined in the style spec (e.g. 'owner').
           { '*': { type: '*' } }),
           styleSpec,
           style,
@@ -23107,6 +23153,10 @@ Use an identity property function instead: ${ example }.`)];
       return validateStyle$1(s, styleSpec);
   }
 
+  const MAPBOX_SOURCE_URL_RE = /^mapbox:\/\/([^/]*)$/;
+  const MAPBOX_GLYPH_URL_RE = /^mapbox:\/\/fonts\/([^/]*)\/{fontstack}\/{range}.pbf$/;
+  const MAPBOX_SPRITE_URL_RE = /^mapbox:\/\/sprites\/([^/]*)\/([^/]*)\/?([^/]*)?$/;
+  const VISIBILITY_RE = /^(public|private)$/;
   const SUPPORTED_SPEC_VERSION = 8;
   const MAX_SOURCES_IN_STYLE = 15;
   function isValid(value, regex) {
@@ -23146,8 +23196,7 @@ Use an identity property function instead: ${ example }.`)];
       if (!acceptedSourceTypes.has(String(source.type))) {
           errors.push(new ValidationError(`sources[${ i }].type`, source.type, `Expected one of [${ Array.from(acceptedSourceTypes).join(', ') }]`));
       }
-      const sourceUrlPattern = /^mapbox:\/\/([^/]*)$/;
-      if (!('url' in source) || !isValid(source.url, sourceUrlPattern)) {
+      if (!('url' in source) || !isValid(source.url, MAPBOX_SOURCE_URL_RE)) {
           errors.push(new ValidationError(`sources[${ i }].url`, source.url, 'Expected a valid Mapbox tileset url'));
       }
       return errors;
@@ -23219,16 +23268,13 @@ Use an identity property function instead: ${ example }.`)];
       if (style.version > SUPPORTED_SPEC_VERSION || style.version < SUPPORTED_SPEC_VERSION) {
           errors.push(new ValidationError('version', style.version, `Style version must be ${ SUPPORTED_SPEC_VERSION }`));
       }
-      const glyphUrlPattern = /^mapbox:\/\/fonts\/([^/]*)\/{fontstack}\/{range}.pbf$/;
-      if (!isValid(style.glyphs, glyphUrlPattern)) {
+      if (!isValid(style.glyphs, MAPBOX_GLYPH_URL_RE)) {
           errors.push(new ValidationError('glyphs', style.glyphs, 'Styles must reference glyphs hosted by Mapbox'));
       }
-      const spriteUrlPattern = /^mapbox:\/\/sprites\/([^/]*)\/([^/]*)\/?([^/]*)?$/;
-      if (!isValid(style.sprite, spriteUrlPattern)) {
+      if (!isValid(style.sprite, MAPBOX_SPRITE_URL_RE)) {
           errors.push(new ValidationError('sprite', style.sprite, 'Styles must reference sprites hosted by Mapbox'));
       }
-      const visibilityPattern = /^(public|private)$/;
-      if (!isValid(style.visibility, visibilityPattern)) {
+      if (!isValid(style.visibility, VISIBILITY_RE)) {
           errors.push(new ValidationError('visibility', style.visibility, 'Style visibility must be public or private'));
       }
       if (style.protected !== void 0 && !isBoolean(style.protected)) {