@mapbox/mapbox-gl-style-spec 14.15.0-beta.2 → 14.15.0

package/deref.ts

@@ -7,12 +7,14 @@ function deref(layer: LayerSpecification, parent: LayerSpecification): LayerSpec
 
     for (const k in layer) {
         if (k !== 'ref') {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
             result[k] = layer[k];
         }
     }
 
     refProperties.forEach((k) => {
         if (k in parent) {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
             result[k] = parent[k];
         }
     });
@@ -36,6 +38,7 @@ function deref(layer: LayerSpecification, parent: LayerSpecification): LayerSpec
 export default function derefLayers(layers: Array<LayerSpecification>): Array<LayerSpecification> {
     layers = layers.slice();
 
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const map: Record<string, LayerSpecification> = Object.create(null);
     for (let i = 0; i < layers.length; i++) {
         map[layers[i].id] = layers[i];

package/diff.ts

@@ -195,13 +195,17 @@ function updateSource(sourceId: string, after: Sources, commands: Array<Command>
 function canUpdateGeoJSON(before: Sources, after: Sources, sourceId: string) {
     let prop;
     for (prop in before[sourceId]) {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         if (!before[sourceId].hasOwnProperty(prop)) continue;
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         if (prop !== 'data' && !isEqual(before[sourceId][prop], after[sourceId][prop])) {
             return false;
         }
     }
     for (prop in after[sourceId]) {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         if (!after[sourceId].hasOwnProperty(prop)) continue;
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         if (prop !== 'data' && !isEqual(before[sourceId][prop], after[sourceId][prop])) {
             return false;
         }
@@ -217,23 +221,33 @@ function diffSources(before: Sources, after: Sources, commands: Array<Command>,
 
     // look for sources to remove
     for (sourceId in before) {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         if (!before.hasOwnProperty(sourceId)) continue;
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         if (!after.hasOwnProperty(sourceId)) {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
             removeSource(sourceId, commands, sourcesRemoved);
         }
     }
 
     // look for sources to add/update
     for (sourceId in after) {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         if (!after.hasOwnProperty(sourceId)) continue;
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         const source = after[sourceId];
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         if (!before.hasOwnProperty(sourceId)) {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
             addSource(sourceId, after, commands);
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         } else if (!isEqual(before[sourceId], source)) {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-argument
             if (before[sourceId].type === 'geojson' && source.type === 'geojson' && canUpdateGeoJSON(before, after, sourceId)) {
                 commands.push({command: operations.setGeoJSONSourceData, args: [sourceId, source.data]});
             } else {
                 // no update command, must remove then add
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
                 updateSource(sourceId, after, commands, sourcesRemoved);
             }
         }
@@ -256,14 +270,20 @@ function diffLayerPropertyChanges(
     let prop;
 
     for (prop in before) {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         if (!before.hasOwnProperty(prop)) continue;
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         if (!isEqual(before[prop], after[prop])) {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
             commands.push({command, args: [layerId, prop, after[prop], klass]});
         }
     }
     for (prop in after) {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         if (!after.hasOwnProperty(prop) || before.hasOwnProperty(prop)) continue;
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         if (!isEqual(before[prop], after[prop])) {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
             commands.push({command, args: [layerId, prop, after[prop], klass]});
         }
     }
@@ -294,15 +314,19 @@ function diffLayers(before: Array<LayerSpecification>, after: Array<LayerSpecifi
     const tracker = beforeOrder.slice();
 
     // layers that have been added do not need to be diffed
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
     const clean = Object.create(null);
 
     let i, d, layerId, beforeLayer: LayerSpecification, afterLayer: LayerSpecification, insertBeforeLayerId, prop;
 
     // remove layers
     for (i = 0, d = 0; i < beforeOrder.length; i++) {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         layerId = beforeOrder[i];
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         if (!afterIndex.hasOwnProperty(layerId)) {
             commands.push({command: operations.removeLayer, args: [layerId]});
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
             tracker.splice(tracker.indexOf(layerId, d), 1);
         } else {
             // limit where in tracker we need to look for a match
@@ -317,9 +341,11 @@ function diffLayers(before: Array<LayerSpecification>, after: Array<LayerSpecifi
 
         if (tracker[tracker.length - 1 - i] === layerId) continue;
 
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         if (beforeIndex.hasOwnProperty(layerId)) {
             // remove the layer before we insert at the correct position
             commands.push({command: operations.removeLayer, args: [layerId]});
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
             tracker.splice(tracker.lastIndexOf(layerId, tracker.length - d), 1);
         } else {
             // limit where in tracker we need to look for a match
@@ -328,18 +354,25 @@ function diffLayers(before: Array<LayerSpecification>, after: Array<LayerSpecifi
 
         // add layer at correct position
         insertBeforeLayerId = tracker[tracker.length - i];
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         commands.push({command: operations.addLayer, args: [afterIndex[layerId], insertBeforeLayerId]});
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         tracker.splice(tracker.length - i, 0, layerId);
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         clean[layerId] = true;
     }
 
     // update layers
     for (i = 0; i < afterOrder.length; i++) {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         layerId = afterOrder[i];
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
         beforeLayer = beforeIndex[layerId];
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment, @typescript-eslint/no-unsafe-member-access
         afterLayer = afterIndex[layerId];
 
         // no need to update if previously added (new or moved)
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         if (clean[layerId] || isEqual(beforeLayer, afterLayer)) continue;
 
         // If source, source-layer, or type have changes, then remove the layer
@@ -348,13 +381,16 @@ function diffLayers(before: Array<LayerSpecification>, after: Array<LayerSpecifi
             commands.push({command: operations.removeLayer, args: [layerId]});
             // we add the layer back at the same position it was already in, so
             // there's no need to update the `tracker`
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
             insertBeforeLayerId = tracker[tracker.lastIndexOf(layerId) + 1];
             commands.push({command: operations.addLayer, args: [afterLayer, insertBeforeLayerId]});
             continue;
         }
 
         // layout, paint, filter, minzoom, maxzoom
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         diffLayerPropertyChanges(beforeLayer.layout, afterLayer.layout, commands, layerId, null, operations.setLayoutProperty);
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         diffLayerPropertyChanges(beforeLayer.paint, afterLayer.paint, commands, layerId, null, operations.setPaintProperty);
         if (!isEqual(beforeLayer.slot, afterLayer.slot)) {
             commands.push({command: operations.setSlot, args: [layerId, afterLayer.slot]});
@@ -368,22 +404,32 @@ function diffLayers(before: Array<LayerSpecification>, after: Array<LayerSpecifi
 
         // handle all other layer props, including paint.*
         for (prop in beforeLayer) {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
             if (!beforeLayer.hasOwnProperty(prop)) continue;
             if (prop === 'layout' || prop === 'paint' || prop === 'filter' ||
                 prop === 'metadata' || prop === 'minzoom' || prop === 'maxzoom' || prop === 'slot') continue;
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
             if (prop.indexOf('paint.') === 0) {
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
                 diffLayerPropertyChanges(beforeLayer[prop], afterLayer[prop], commands, layerId, prop.slice(6), operations.setPaintProperty);
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
             } else if (!isEqual(beforeLayer[prop], afterLayer[prop])) {
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
                 commands.push({command: operations.setLayerProperty, args: [layerId, prop, afterLayer[prop]]});
             }
         }
         for (prop in afterLayer) {
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
             if (!afterLayer.hasOwnProperty(prop) || beforeLayer.hasOwnProperty(prop)) continue;
             if (prop === 'layout' || prop === 'paint' || prop === 'filter' ||
                 prop === 'metadata' || prop === 'minzoom' || prop === 'maxzoom' || prop === 'slot') continue;
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-call, @typescript-eslint/no-unsafe-member-access
             if (prop.indexOf('paint.') === 0) {
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-argument, @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-call
                 diffLayerPropertyChanges(beforeLayer[prop], afterLayer[prop], commands, layerId, prop.slice(6), operations.setPaintProperty);
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
             } else if (!isEqual(beforeLayer[prop], afterLayer[prop])) {
+                // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
                 commands.push({command: operations.setLayerProperty, args: [layerId, prop, afterLayer[prop]]});
             }
         }
@@ -409,9 +455,12 @@ export function diffImports(before: Array<ImportSpecification> | null | undefine
 
     // remove imports
     for (i = 0, d = 0; i < beforeOrder.length; i++) {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         importId = beforeOrder[i];
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         if (!afterIndex.hasOwnProperty(importId)) {
             commands.push({command: operations.removeImport, args: [importId]});
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
             tracker.splice(tracker.indexOf(importId, d), 1);
         } else {
             // limit where in tracker we need to look for a match
@@ -426,9 +475,11 @@ export function diffImports(before: Array<ImportSpecification> | null | undefine
 
         if (tracker[tracker.length - 1 - i] === importId) continue;
 
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         if (beforeIndex.hasOwnProperty(importId)) {
             // remove the import before we insert at the correct position
             commands.push({command: operations.removeImport, args: [importId]});
+            // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
             tracker.splice(tracker.lastIndexOf(importId, tracker.length - d), 1);
         } else {
             // limit where in tracker we need to look for a match
@@ -437,14 +488,18 @@ export function diffImports(before: Array<ImportSpecification> | null | undefine
 
         // add import at correct position
         insertBefore = tracker[tracker.length - i];
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         commands.push({command: operations.addImport, args: [afterIndex[importId], insertBefore]});
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         tracker.splice(tracker.length - i, 0, importId);
     }
 
     // update imports
     for (const afterImport of after) {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
         const beforeImport = beforeIndex[afterImport.id];
         if (!beforeImport) continue;
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         delete beforeImport.data;
         if (isEqual(beforeImport, afterImport)) continue;
 
@@ -460,7 +515,9 @@ function diffIconsets(before: IconsetsSpecification, after: IconsetsSpecificatio
 
     // look for iconsets to remove
     for (iconsetId in before) {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         if (!before.hasOwnProperty(iconsetId)) continue;
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         if (!after.hasOwnProperty(iconsetId)) {
             commands.push({command: operations.removeIconset, args: [iconsetId]});
         }
@@ -468,10 +525,14 @@ function diffIconsets(before: IconsetsSpecification, after: IconsetsSpecificatio
 
     // look for iconsets to add/update
     for (iconsetId in after) {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         if (!after.hasOwnProperty(iconsetId)) continue;
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         const iconset = after[iconsetId];
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         if (!before.hasOwnProperty(iconsetId)) {
             commands.push({command: operations.addIconset, args: [iconsetId, iconset]});
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access
         } else if (!isEqual(before[iconsetId], iconset)) {
             commands.push({command: operations.removeIconset, args: [iconsetId]});
             commands.push({command: operations.addIconset, args: [iconsetId, iconset]});
@@ -569,6 +630,7 @@ export default function diffStyles(before: StyleSpecification, after: StyleSpeci
 
         // First collect the {add,remove}Source commands
         const removeOrAddSourceCommands = [];
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         diffSources(before.sources, after.sources, removeOrAddSourceCommands, sourcesRemoved);
 
         // Push a removeLayer command for each style layer that depends on a
@@ -605,6 +667,7 @@ export default function diffStyles(before: StyleSpecification, after: StyleSpeci
         }
 
         // Handle changes to `layers`
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-argument
         diffLayers(beforeLayers, after.layers, commands);
     } catch (e) {
         // fall back to setStyle