@mapbox/mapbox-gl-style-spec 14.11.0 → 14.12.0

package/composite.ts

@@ -21,6 +21,7 @@ export default function (style) {
     }
 
     if (styleIDs.length < 2)
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-return
         return style;
 
     styleIDs.forEach((id) => {
@@ -48,5 +49,6 @@ export default function (style) {
         }
     });
 
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-return
     return style;
 }

package/deref.ts

@@ -3,7 +3,7 @@ import refProperties from './util/ref_properties';
 import type {LayerSpecification} from './types';
 
 function deref(layer: LayerSpecification, parent: LayerSpecification): LayerSpecification {
-    const result: Record<string, any> = {};
+    const result = {} as LayerSpecification;
 
     for (const k in layer) {
         if (k !== 'ref') {
@@ -13,11 +13,11 @@ function deref(layer: LayerSpecification, parent: LayerSpecification): LayerSpec
 
     refProperties.forEach((k) => {
         if (k in parent) {
-            result[k] = (parent as any)[k];
+            result[k] = parent[k];
         }
     });
 
-    return result as LayerSpecification;
+    return result;
 }
 
 /**
@@ -36,14 +36,14 @@ function deref(layer: LayerSpecification, parent: LayerSpecification): LayerSpec
 export default function derefLayers(layers: Array<LayerSpecification>): Array<LayerSpecification> {
     layers = layers.slice();
 
-    const map: any = Object.create(null);
+    const map: Record<string, LayerSpecification> = Object.create(null);
     for (let i = 0; i < layers.length; i++) {
         map[layers[i].id] = layers[i];
     }
 
     for (let i = 0; i < layers.length; i++) {
         if ('ref' in layers[i]) {
-            layers[i] = deref(layers[i], map[(layers[i] as any).ref]);
+            layers[i] = deref(layers[i], map[(layers[i] as LayerSpecification & {ref: string}).ref]);
         }
     }
 

package/diff.ts

@@ -1,6 +1,6 @@
 import isEqual from './util/deep_equal';
 
-import type {StyleSpecification, ImportSpecification, SourceSpecification, LayerSpecification} from './types';
+import type {StyleSpecification, ImportSpecification, SourceSpecification, LayerSpecification, IconsetsSpecification} from './types';
 
 type Sources = {
     [key: string]: SourceSpecification;
@@ -8,12 +8,10 @@ type Sources = {
 
 type Command = {
     command: string;
-    args: Array<any>;
+    args: unknown[];
 };
 
-export const operations: {
-    [_: string]: string;
-} = {
+export const operations = {
 
     /*
      * { command: 'setStyle', args: [stylesheet] }
@@ -163,8 +161,18 @@ export const operations: {
     /**
      * { command: 'updateImport', args: [importId, importSpecification | styleUrl] }
      */
-    updateImport: 'updateImport'
-};
+    updateImport: 'updateImport',
+
+    /*
+     *  { command: 'addIconset', args: [iconsetId, IconsetSpecification] }
+     */
+    addIconset: 'addIconset',
+
+    /*
+     *  { command: 'removeIconset', args: [iconsetId] }
+     */
+    removeIconset: 'removeIconset'
+} as const;
 
 function addSource(sourceId: string, after: Sources, commands: Array<Command>) {
     commands.push({command: operations.addSource, args: [sourceId, after[sourceId]]});
@@ -201,9 +209,7 @@ function canUpdateGeoJSON(before: Sources, after: Sources, sourceId: string) {
     return true;
 }
 
-function diffSources(before: Sources, after: Sources, commands: Array<Command>, sourcesRemoved: {
-    [key: string]: true;
-}) {
+function diffSources(before: Sources, after: Sources, commands: Array<Command>, sourcesRemoved: {[key: string]: true}) {
     before = before || {};
     after = after || {};
 
@@ -234,7 +240,16 @@ function diffSources(before: Sources, after: Sources, commands: Array<Command>,
     }
 }
 
-function diffLayerPropertyChanges(before: any, after: any, commands: Array<Command>, layerId: string, klass: string | null | undefined, command: string) {
+function diffLayerPropertyChanges(before: LayerSpecification['layout'], after: LayerSpecification['layout'], commands: Array<Command>, layerId: string, klass: string | null | undefined, command: string): void;
+function diffLayerPropertyChanges(before: LayerSpecification['paint'], after: LayerSpecification['paint'], commands: Array<Command>, layerId: string, klass: string | null | undefined, command: string): void;
+function diffLayerPropertyChanges(
+    before: LayerSpecification['paint'] | LayerSpecification['layout'],
+    after: LayerSpecification['paint'] | LayerSpecification['layout'],
+    commands: Command[],
+    layerId: string,
+    klass: string | null | undefined,
+    command: string
+) {
     before = before || {};
     after = after || {};
 
@@ -254,22 +269,11 @@ function diffLayerPropertyChanges(before: any, after: any, commands: Array<Comma
     }
 }
 
-function pluckId<T extends {
-    id: string;
-}>(item: T): string {
+function pluckId<T extends {id: string}>(item: T): string {
     return item.id;
 }
 
-function indexById<T extends {
-    id: string;
-}>(
-    group: {
-        [key: string]: T;
-    },
-    item: T,
-): {
-    [id: string]: T;
-} {
+function indexById<T extends {id: string}>(group: {[key: string]: T}, item: T): {[id: string]: T} {
     group[item.id] = item;
     return group;
 }
@@ -283,14 +287,14 @@ function diffLayers(before: Array<LayerSpecification>, after: Array<LayerSpecifi
     const afterOrder = after.map(pluckId);
 
     // index of layer by id
-    const beforeIndex = before.reduce<Record<string, any>>(indexById, {});
-    const afterIndex = after.reduce<Record<string, any>>(indexById, {});
+    const beforeIndex = before.reduce(indexById, {});
+    const afterIndex = after.reduce(indexById, {});
 
     // track order of layers as if they have been mutated
     const tracker = beforeOrder.slice();
 
     // layers that have been added do not need to be diffed
-    const clean: any = Object.create(null);
+    const clean = Object.create(null);
 
     let i, d, layerId, beforeLayer: LayerSpecification, afterLayer: LayerSpecification, insertBeforeLayerId, prop;
 
@@ -395,8 +399,8 @@ export function diffImports(before: Array<ImportSpecification> | null | undefine
     const afterOrder = after.map(pluckId);
 
     // index imports by id
-    const beforeIndex = before.reduce<Record<string, any>>(indexById, {});
-    const afterIndex = after.reduce<Record<string, any>>(indexById, {});
+    const beforeIndex = before.reduce(indexById, {});
+    const afterIndex = after.reduce(indexById, {});
 
     // track order of imports as if they have been mutated
     const tracker = beforeOrder.slice();
@@ -446,6 +450,33 @@ export function diffImports(before: Array<ImportSpecification> | null | undefine
     }
 }
 
+function diffIconsets(before: IconsetsSpecification, after: IconsetsSpecification, commands: Array<Command>) {
+    before = before || {};
+    after = after || {};
+
+    let iconsetId;
+
+    // look for iconsets to remove
+    for (iconsetId in before) {
+        if (!before.hasOwnProperty(iconsetId)) continue;
+        if (!after.hasOwnProperty(iconsetId)) {
+            commands.push({command: operations.removeIconset, args: [iconsetId]});
+        }
+    }
+
+    // look for iconsets to add/update
+    for (iconsetId in after) {
+        if (!after.hasOwnProperty(iconsetId)) continue;
+        const iconset = after[iconsetId];
+        if (!before.hasOwnProperty(iconsetId)) {
+            commands.push({command: operations.addIconset, args: [iconsetId, iconset]});
+        } else if (!isEqual(before[iconsetId], iconset)) {
+            commands.push({command: operations.removeIconset, args: [iconsetId]});
+            commands.push({command: operations.addIconset, args: [iconsetId, iconset]});
+        }
+    }
+}
+
 /**
  * Diff two stylesheet
  *
@@ -520,6 +551,9 @@ export default function diffStyles(before: StyleSpecification, after: StyleSpeci
         if (!isEqual(before.camera, after.camera)) {
             commands.push({command: operations.setCamera, args: [after.camera]});
         }
+        if (!isEqual(before.iconsets, after.iconsets)) {
+            diffIconsets(before.iconsets, after.iconsets, commands);
+        }
         if (!isEqual(before["color-theme"], after["color-theme"])) {
             // Update this to setColorTheme after
             // https://mapbox.atlassian.net/browse/GLJS-842 is implemented
@@ -529,7 +563,7 @@ export default function diffStyles(before: StyleSpecification, after: StyleSpeci
         // Handle changes to `sources`
         // If a source is to be removed, we also--before the removeSource
         // command--need to remove all the style layers that depend on it.
-        const sourcesRemoved: Record<string, any> = {};
+        const sourcesRemoved: Record<string, true> = {};
 
         // First collect the {add,remove}Source commands
         const removeOrAddSourceCommands = [];
@@ -570,7 +604,7 @@ export default function diffStyles(before: StyleSpecification, after: StyleSpeci
 
         // Handle changes to `layers`
         diffLayers(beforeLayers, after.layers, commands);
-    } catch (e: any) {
+    } catch (e) {
         // fall back to setStyle
         console.warn('Unable to compute style diff:', e);
         commands = [{command: operations.setStyle, args: [after]}];