@mapbox/mapbox-gl-style-spec 14.0.0-beta.4 → 14.0.0-rc.2

package/diff.js

@@ -134,14 +134,24 @@ export const operations: {[_: string]: string} = {
     setProjection: 'setProjection',
 
     /*
-     *  { command: 'addImport', args: [importProperties] }
+     *  { command: 'addImport', args: [import] }
      */
     addImport: 'addImport',
 
     /*
      *  { command: 'removeImport', args: [importId] }
      */
-    removeImport: 'removeImport'
+    removeImport: 'removeImport',
+
+    /*
+     *  { command: 'setImportUrl', args: [importId, styleUrl] }
+     */
+    setImportUrl: 'setImportUrl',
+
+    /*
+     *  { command: 'setImportData', args: [importId, stylesheet] }
+     */
+    setImportData: 'setImportData'
 };
 
 function addSource(sourceId: string, after: Sources, commands: Array<Command>) {
@@ -226,12 +236,12 @@ function diffLayerPropertyChanges(before: any, after: any, commands: Array<Comma
     }
 }
 
-function pluckId(layer: LayerSpecification) {
-    return layer.id;
+function pluckId<T: {id: string}>(item: T): string {
+    return item.id;
 }
 
-function indexById(group: {[string]: LayerSpecification}, layer: LayerSpecification) {
-    group[layer.id] = layer;
+function indexById<T: {id: string}>(group: {[string]: T}, item: T): {[id: string]: T} {
+    group[item.id] = item;
     return group;
 }
 
@@ -345,14 +355,72 @@ function diffLayers(before: Array<LayerSpecification>, after: Array<LayerSpecifi
     }
 }
 
-function diffImports(before: Array<ImportSpecification> = [], after: Array<ImportSpecification> = [], commands: Array<Command>) {
-    // no diff for the imports, must remove then add
-    for (const beforeImport of before) {
-        commands.push({command: operations.removeImport, args: [beforeImport.id]});
+export function diffImports(before: Array<ImportSpecification> = [], after: Array<ImportSpecification> = [], commands: Array<Command>) {
+    before = before || [];
+    after = after || [];
+
+    // order imports by id
+    const beforeOrder = before.map(pluckId);
+    const afterOrder = after.map(pluckId);
+
+    // index imports by id
+    const beforeIndex = before.reduce(indexById, {});
+    const afterIndex = after.reduce(indexById, {});
+
+    // track order of imports as if they have been mutated
+    const tracker = beforeOrder.slice();
+
+    let i, d, importId, insertBefore;
+
+    // remove imports
+    for (i = 0, d = 0; i < beforeOrder.length; i++) {
+        importId = beforeOrder[i];
+        if (!afterIndex.hasOwnProperty(importId)) {
+            commands.push({command: operations.removeImport, args: [importId]});
+            tracker.splice(tracker.indexOf(importId, d), 1);
+        } else {
+            // limit where in tracker we need to look for a match
+            d++;
+        }
+    }
+
+    // add/reorder imports
+    for (i = 0, d = 0; i < afterOrder.length; i++) {
+        // work backwards as insert is before an existing import
+        importId = afterOrder[afterOrder.length - 1 - i];
+
+        if (tracker[tracker.length - 1 - i] === importId) continue;
+
+        if (beforeIndex.hasOwnProperty(importId)) {
+            // remove the import before we insert at the correct position
+            commands.push({command: operations.removeImport, args: [importId]});
+            tracker.splice(tracker.lastIndexOf(importId, tracker.length - d), 1);
+        } else {
+            // limit where in tracker we need to look for a match
+            d++;
+        }
+
+        // add import at correct position
+        insertBefore = tracker[tracker.length - i];
+        commands.push({command: operations.addImport, args: [afterIndex[importId], insertBefore]});
+        tracker.splice(tracker.length - i, 0, importId);
     }
 
+    // update imports
     for (const afterImport of after) {
-        commands.push({command: operations.addImport, args: [afterImport]});
+        const beforeImport = beforeIndex[afterImport.id];
+        if (!beforeImport || isEqual(beforeImport, afterImport)) continue;
+
+        if (!isEqual(beforeImport.url, afterImport.url)) {
+            commands.push({command: operations.setImportUrl, args: [afterImport.id, afterImport.url]});
+        }
+
+        const beforeData = beforeImport && beforeImport.data;
+        const afterData = afterImport.data;
+
+        if (!isEqual(beforeData, afterData)) {
+            commands.push({command: operations.setImportData, args: [afterImport.id, afterData]});
+        }
     }
 }