@mapbox/mapbox-gl-style-spec 14.4.0 → 14.5.0

package/bin/gl-style-composite.js

@@ -1,13 +1,8 @@
 #!/usr/bin/env node
-
-// @flow
 /* eslint-disable no-process-exit */
 
 import fs from 'fs';
 import minimist from 'minimist';
-
-/* eslint import/no-unresolved: [error, { ignore: ['^@mapbox/mapbox-gl-style-spec$'] }] */
-/* $FlowFixMe[cannot-resolve-module] */
 import {format, composite} from '@mapbox/mapbox-gl-style-spec';
 
 const argv = minimist(process.argv.slice(2));

package/bin/gl-style-format.js

@@ -1,13 +1,8 @@
 #!/usr/bin/env node
-
-// @flow
 /* eslint-disable no-process-exit */
 
 import fs from 'fs';
 import minimist from 'minimist';
-
-/* eslint import/no-unresolved: [error, { ignore: ['^@mapbox/mapbox-gl-style-spec$'] }] */
-/* $FlowFixMe[cannot-resolve-module] */
 import {format} from '@mapbox/mapbox-gl-style-spec';
 
 const argv = minimist(process.argv.slice(2));

package/bin/gl-style-migrate.js

@@ -1,13 +1,8 @@
 #!/usr/bin/env node
-
-// @flow
 /* eslint-disable no-process-exit */
 
 import fs from 'fs';
 import minimist from 'minimist';
-
-/* eslint import/no-unresolved: [error, { ignore: ['^@mapbox/mapbox-gl-style-spec$'] }] */
-/* $FlowFixMe[cannot-resolve-module] */
 import {format, migrate} from '@mapbox/mapbox-gl-style-spec';
 
 const argv = minimist(process.argv.slice(2));

package/bin/gl-style-validate.js

@@ -1,13 +1,8 @@
 #!/usr/bin/env node
-
-// @flow
 /* eslint-disable no-process-exit */
 
 import rw from 'rw';
 import minimist from 'minimist';
-
-/* eslint import/no-unresolved: [error, { ignore: ['^@mapbox/mapbox-gl-style-spec$'] }] */
-/* $FlowFixMe[cannot-resolve-module] */
 import {validate, validateMapboxApiSupported} from '@mapbox/mapbox-gl-style-spec';
 
 const argv = minimist(process.argv.slice(2), {

package/{composite.js → composite.ts}

@@ -1,4 +1,4 @@
-// @noflow
+// @ts-nocheck
 
 export default function (style) {
     const styleIDs = [];

package/data/{extent.js → extent.ts}

@@ -1,5 +1,3 @@
-// @flow
-
 /**
  * The maximum value of a coordinate in the internal tile coordinate system. Coordinates of
  * all source features normalized to this extent upon load.

package/{deref.js → deref.ts}

@@ -1,11 +1,9 @@
-// @flow
+import refProperties from './util/ref_properties';
 
-import refProperties from './util/ref_properties.js';
-
-import type {LayerSpecification} from './types.js';
+import type {LayerSpecification} from './types';
 
 function deref(layer: LayerSpecification, parent: LayerSpecification): LayerSpecification {
-    const result = {};
+    const result: Record<string, any> = {};
 
     for (const k in layer) {
         if (k !== 'ref') {
@@ -15,11 +13,11 @@ function deref(layer: LayerSpecification, parent: LayerSpecification): LayerSpec
 
     refProperties.forEach((k) => {
         if (k in parent) {
-            result[k] = (parent: any)[k];
+            result[k] = (parent as any)[k];
         }
     });
 
-    return ((result: any): LayerSpecification);
+    return result as LayerSpecification;
 }
 
 /**
@@ -38,14 +36,14 @@ function deref(layer: LayerSpecification, parent: LayerSpecification): LayerSpec
 export default function derefLayers(layers: Array<LayerSpecification>): Array<LayerSpecification> {
     layers = layers.slice();
 
-    const map: Object = Object.create(null);
+    const map: any = 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]: any).ref]);
+            layers[i] = deref(layers[i], map[(layers[i] as any).ref]);
         }
     }
 

package/{diff.js → diff.ts}

@@ -1,17 +1,19 @@
-// @flow
+import isEqual from './util/deep_equal';
 
-import isEqual from './util/deep_equal.js';
+import type {StyleSpecification, ImportSpecification, SourceSpecification, LayerSpecification} from './types';
 
-import type {StyleSpecification, ImportSpecification, SourceSpecification, LayerSpecification} from './types.js';
-
-type Sources = { [string]: SourceSpecification };
+type Sources = {
+    [key: string]: SourceSpecification;
+};
 
 type Command = {
     command: string;
     args: Array<any>;
 };
 
-export const operations: {[_: string]: string} = {
+export const operations: {
+    [_: string]: string;
+} = {
 
     /*
      * { command: 'setStyle', args: [stylesheet] }
@@ -158,12 +160,16 @@ function addSource(sourceId: string, after: Sources, commands: Array<Command>) {
     commands.push({command: operations.addSource, args: [sourceId, after[sourceId]]});
 }
 
-function removeSource(sourceId: string, commands: Array<Command>, sourcesRemoved: {[string]: true}) {
+function removeSource(sourceId: string, commands: Array<Command>, sourcesRemoved: {
+    [key: string]: true;
+}) {
     commands.push({command: operations.removeSource, args: [sourceId]});
     sourcesRemoved[sourceId] = true;
 }
 
-function updateSource(sourceId: string, after: Sources, commands: Array<Command>, sourcesRemoved: {[string]: true}) {
+function updateSource(sourceId: string, after: Sources, commands: Array<Command>, sourcesRemoved: {
+    [key: string]: true;
+}) {
     removeSource(sourceId, commands, sourcesRemoved);
     addSource(sourceId, after, commands);
 }
@@ -185,7 +191,9 @@ function canUpdateGeoJSON(before: Sources, after: Sources, sourceId: string) {
     return true;
 }
 
-function diffSources(before: Sources, after: Sources, commands: Array<Command>, sourcesRemoved: {[string]: true}) {
+function diffSources(before: Sources, after: Sources, commands: Array<Command>, sourcesRemoved: {
+    [key: string]: true;
+}) {
     before = before || {};
     after = after || {};
 
@@ -216,7 +224,7 @@ function diffSources(before: Sources, after: Sources, commands: Array<Command>,
     }
 }
 
-function diffLayerPropertyChanges(before: any, after: any, commands: Array<Command>, layerId: string, klass: ?string, command: string) {
+function diffLayerPropertyChanges(before: any, after: any, commands: Array<Command>, layerId: string, klass: string | null | undefined, command: string) {
     before = before || {};
     after = after || {};
 
@@ -236,11 +244,22 @@ function diffLayerPropertyChanges(before: any, after: any, commands: Array<Comma
     }
 }
 
-function pluckId<T: {id: string}>(item: T): string {
+function pluckId<T extends {
+    id: string;
+}>(item: T): string {
     return item.id;
 }
 
-function indexById<T: {id: string}>(group: {[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;
 }
@@ -254,14 +273,14 @@ function diffLayers(before: Array<LayerSpecification>, after: Array<LayerSpecifi
     const afterOrder = after.map(pluckId);
 
     // index of layer by id
-    const beforeIndex = before.reduce(indexById, {});
-    const afterIndex = after.reduce(indexById, {});
+    const beforeIndex = before.reduce<Record<string, any>>(indexById, {});
+    const afterIndex = after.reduce<Record<string, any>>(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: Object = Object.create(null);
+    const clean: any = Object.create(null);
 
     let i, d, layerId, beforeLayer: LayerSpecification, afterLayer: LayerSpecification, insertBeforeLayerId, prop;
 
@@ -311,7 +330,6 @@ function diffLayers(before: Array<LayerSpecification>, after: Array<LayerSpecifi
 
         // If source, source-layer, or type have changes, then remove the layer
         // and add it back 'from scratch'.
-        // $FlowFixMe[prop-missing] - there is no `source-layer` in background and sky layers
         if (!isEqual(beforeLayer.source, afterLayer.source) || !isEqual(beforeLayer['source-layer'], afterLayer['source-layer']) || !isEqual(beforeLayer.type, afterLayer.type)) {
             commands.push({command: operations.removeLayer, args: [layerId]});
             // we add the layer back at the same position it was already in, so
@@ -358,7 +376,7 @@ function diffLayers(before: Array<LayerSpecification>, after: Array<LayerSpecifi
     }
 }
 
-export function diffImports(before: Array<ImportSpecification> = [], after: Array<ImportSpecification> = [], commands: Array<Command>) {
+export function diffImports(before: Array<ImportSpecification> | null | undefined = [], after: Array<ImportSpecification> | null | undefined = [], commands: Array<Command>) {
     before = before || [];
     after = after || [];
 
@@ -367,8 +385,8 @@ export function diffImports(before: Array<ImportSpecification> = [], after: Arra
     const afterOrder = after.map(pluckId);
 
     // index imports by id
-    const beforeIndex = before.reduce(indexById, {});
-    const afterIndex = after.reduce(indexById, {});
+    const beforeIndex = before.reduce<Record<string, any>>(indexById, {});
+    const afterIndex = after.reduce<Record<string, any>>(indexById, {});
 
     // track order of imports as if they have been mutated
     const tracker = beforeOrder.slice();
@@ -486,11 +504,16 @@ 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["color-theme"], after["color-theme"])) {
+            // Update this to setColorTheme after
+            // https://mapbox.atlassian.net/browse/GLJS-842 is implemented
+            return [{command: operations.setStyle, args: [after]}];
+        }
 
         // 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 = {};
+        const sourcesRemoved: Record<string, any> = {};
 
         // First collect the {add,remove}Source commands
         const removeOrAddSourceCommands = [];
@@ -531,7 +554,7 @@ export default function diffStyles(before: StyleSpecification, after: StyleSpeci
 
         // Handle changes to `layers`
         diffLayers(beforeLayers, after.layers, commands);
-    } catch (e) {
+    } catch (e: any) {
         // fall back to setStyle
         console.warn('Unable to compute style diff:', e);
         commands = [{command: operations.setStyle, args: [after]}];