update d3.nest(...).rollup(...) to d3.rollups (#2)

uwdata · Sep 28, 2020 · 078da1d · 078da1d
1 parent 3c42fb4
commit 078da1d
Show file tree

Hide file tree

Showing 8 changed files with 357 additions and 259 deletions.
diff --git a/gemini.js b/gemini.js
diff --git a/gemini.web.js b/gemini.web.js
@@ -11537,20 +11537,20 @@
     if (typeof groupby === "string") {
       groupby = [groupby];
     }
-    return d3.nest()
-      .key(d => groupby.map(f => d.datum[f]).join("@@_@@"))
-      .entries(data)
+    return d3.groups(data, d => groupby.map(f => d.datum[f]).join("@@_@@"))
       .map(group => {
+        const values  = group[1];
         let datum = groupby.reduce((datum, f) => {
-          datum[f] = group.values[0].datum[f];
+          datum[f] = values[0].datum[f];
           return datum;
-        }, { count: group.values.length });
+        }, { count: values.length });
         return {
           datum: datum,
           mark: {role: "group", marktype: "group"},
-          items: [{items: group.values }]
+          items: [{items: values }]
         };
       });
+
   }
   function unpackData(data) {
     if (data[0].mark.marktype !== "group") {
@@ -16156,32 +16156,43 @@
         return (acc = acc && (val !== undefined ? !isNaN(Number(val)) : true));
       }, true);
     if (!staggering.by) {
-      grouped = d3.nest()
-        .key(d => {
-          const val = d.__staggering_id__;
-          return val === undefined ? "__empty__" : val;
-        })
-        .sortKeys(getOrderFn(true, staggering.order))
-        .entries(dataWithTiming);
+
+
+      const orderFn = getOrderFn(true, staggering.order);
+      grouped = d3.groups(dataWithTiming, d => {
+        const val = d.__staggering_id__;
+        return val === undefined ? "__empty__" : val;
+      });
+      if (typeof(orderFn) === "function") {
+        grouped.sort((a,b) => orderFn(a,b));
+      }
     } else if (typeof staggering.by === "string") {
-      grouped = d3.nest()
-        .key(d => {
-          const val = (d.initial || d.final)[staggering.by];
-          return val === undefined ? "__empty__" : val;
-        })
-        .sortKeys(getOrderFn(isNumber, staggering.order))
-        .entries(dataWithTiming);
+
+
+      grouped = d3.groups(dataWithTiming, d => {
+        const val = (d.initial || d.final)[staggering.by];
+        return val === undefined ? "__empty__" : val;
+      });
+
+      const orderFn = getOrderFn(isNumber, staggering.order);
+      if (typeof(orderFn) === "function") {
+        grouped.sort((a,b) => orderFn(a,b));
+      }
     } else if (staggering.by.initial || staggering.by.final) {
       const which = staggering.by.initial ? "initial" : "final";
-      grouped = d3.nest()
-        .key(d => {
-          const val = (which === "initial"
-            ? d.initial || d.final
-            : d.final || d.initial)[staggering.by[which]];
-          return val === undefined ? "__empty__" : val;
-        })
-        .sortKeys(getOrderFn(isNumber, staggering.order))
-        .entries(dataWithTiming);
+
+
+      grouped = d3.groups(dataWithTiming, d => {
+        const val = (which === "initial"
+          ? d.initial || d.final
+          : d.final || d.initial)[staggering.by[which]];
+        return val === undefined ? "__empty__" : val;
+      });
+
+      const orderFn = getOrderFn(isNumber, staggering.order);
+      if (typeof(orderFn) === "function") {
+        grouped.sort((a,b) => orderFn(a,b));
+      }
     }
 
     N = grouped.length;
@@ -16211,13 +16222,13 @@
       });
 
       timings.groups = grouped.map((g, i) => {
-        return staggeredTiming(subStaggering, g.values, durations[i]);
+        return staggeredTiming(subStaggering, g[1], durations[i]);
       });
 
       return getFlattenTimings(timings);
     }
     grouped.forEach((group, i) => {
-      group.values.forEach(datum => {
+      group[1].forEach(datum => {
         datum.delay = delays[i];
         datum.duration = durations[i];
       });
@@ -22977,9 +22988,8 @@
     }
     let axesScales = vegaAxes.filter(a => a.grid).map(a => a.scale);
 
-    return d3.nest()
-      .key(axis => axis.scale)
-      .rollup(axes => {
+    return d3.rollups(vegaAxes,
+      axes => {
         let axisWithGrid = axes.find(a => a.grid);
         let axisWithoutGrid = { ...axes.find(a => !a.grid) };
 
@@ -22991,9 +23001,10 @@
           axisWithoutGrid.zindex = 0;
         }
         return axisWithoutGrid;
-      }).entries(vegaAxes)
-      .map(d => d.value)
-      .sort((a,b) => (axesScales.indexOf(a.scale) - axesScales.indexOf(b.scale)));
+      },
+      axis => axis.scale
+    ).map(d => d[1])
+     .sort((a,b) => (axesScales.indexOf(a.scale) - axesScales.indexOf(b.scale)));
   }
 
   const { animate } = Gemini;

diff --git a/gemini.web.js.map b/gemini.web.js.map
diff --git a/package.json b/package.json
@@ -50,7 +50,7 @@
   },
   "dependencies": {
     "ajv": "^6.12.0",
-    "d3": "5.14.2",
+    "d3": "^6.2",
     "d3-interpolate-path": "^2.1.1",
     "d3-selection-multi": "^1.0.1",
     "djv": "^2.1.3-alpha.0",

diff --git a/src/actuator/staggering.js b/src/actuator/staggering.js
@@ -1,4 +1,5 @@
 import * as d3 from "d3";
+import { group } from "d3";
 import { flatten } from "../util/util.js";
 import { getEaseFn } from "./util";
 
@@ -37,35 +38,43 @@ function staggeredTiming(staggering, data, duration) {
       return (acc = acc && (val !== undefined ? !isNaN(Number(val)) : true));
     }, true);
   if (!staggering.by) {
-    grouped = d3
-      .nest()
-      .key(d => {
-        const val = d.__staggering_id__;
-        return val === undefined ? "__empty__" : val;
-      })
-      .sortKeys(getOrderFn(true, staggering.order))
-      .entries(dataWithTiming);
+
+
+    const orderFn = getOrderFn(true, staggering.order);
+    grouped = d3.groups(dataWithTiming, d => {
+      const val = d.__staggering_id__;
+      return val === undefined ? "__empty__" : val;
+    })
+    if (typeof(orderFn) === "function") {
+      grouped.sort((a,b) => orderFn(a,b));
+    }
   } else if (typeof staggering.by === "string") {
-    grouped = d3
-      .nest()
-      .key(d => {
-        const val = (d.initial || d.final)[staggering.by];
-        return val === undefined ? "__empty__" : val;
-      })
-      .sortKeys(getOrderFn(isNumber, staggering.order))
-      .entries(dataWithTiming);
+
+
+    grouped = d3.groups(dataWithTiming, d => {
+      const val = (d.initial || d.final)[staggering.by];
+      return val === undefined ? "__empty__" : val;
+    })
+
+    const orderFn = getOrderFn(isNumber, staggering.order);
+    if (typeof(orderFn) === "function") {
+      grouped.sort((a,b) => orderFn(a,b));
+    }
   } else if (staggering.by.initial || staggering.by.final) {
     const which = staggering.by.initial ? "initial" : "final";
-    grouped = d3
-      .nest()
-      .key(d => {
-        const val = (which === "initial"
-          ? d.initial || d.final
-          : d.final || d.initial)[staggering.by[which]];
-        return val === undefined ? "__empty__" : val;
-      })
-      .sortKeys(getOrderFn(isNumber, staggering.order))
-      .entries(dataWithTiming);
+
+
+    grouped = d3.groups(dataWithTiming, d => {
+      const val = (which === "initial"
+        ? d.initial || d.final
+        : d.final || d.initial)[staggering.by[which]];
+      return val === undefined ? "__empty__" : val;
+    })
+
+    const orderFn = getOrderFn(isNumber, staggering.order);
+    if (typeof(orderFn) === "function") {
+      grouped.sort((a,b) => orderFn(a,b));
+    }
   }
 
   N = grouped.length;
@@ -95,13 +104,13 @@ function staggeredTiming(staggering, data, duration) {
     });
 
     timings.groups = grouped.map((g, i) => {
-      return staggeredTiming(subStaggering, g.values, durations[i]);
+      return staggeredTiming(subStaggering, g[1], durations[i]);
     });
 
     return getFlattenTimings(timings);
   }
   grouped.forEach((group, i) => {
-    group.values.forEach(datum => {
+    group[1].forEach(datum => {
       datum.delay = delays[i];
       datum.duration = durations[i];
     });

diff --git a/src/util/vgDataHelper.js b/src/util/vgDataHelper.js
@@ -16,21 +16,20 @@ function facetData(data, facetDef) {
   if (typeof groupby === "string") {
     groupby = [groupby];
   }
-  return d3
-    .nest()
-    .key(d => groupby.map(f => d.datum[f]).join("@@_@@"))
-    .entries(data)
+  return d3.groups(data, d => groupby.map(f => d.datum[f]).join("@@_@@"))
     .map(group => {
+      const values  = group[1]
       let datum = groupby.reduce((datum, f) => {
-        datum[f] = group.values[0].datum[f];
+        datum[f] = values[0].datum[f];
         return datum;
-      }, { count: group.values.length });
+      }, { count: values.length });
       return {
         datum: datum,
         mark: {role: "group", marktype: "group"},
-        items: [{items: group.values }]
+        items: [{items: values }]
       };
     });
+
 }
 function unpackData(data) {
   if (data[0].mark.marktype !== "group") {

diff --git a/src/util/vl2vg4gemini.js b/src/util/vl2vg4gemini.js
@@ -37,9 +37,8 @@ function mergeDuplicatedAxes(vegaAxes) {
   }
   let axesScales = vegaAxes.filter(a => a.grid).map(a => a.scale);
 
-  return d3.nest()
-    .key(axis => axis.scale)
-    .rollup(axes => {
+  return d3.rollups(vegaAxes,
+    axes => {
       let axisWithGrid = axes.find(a => a.grid);
       let axisWithoutGrid = { ...axes.find(a => !a.grid) };
 
@@ -51,8 +50,9 @@ function mergeDuplicatedAxes(vegaAxes) {
         axisWithoutGrid.zindex = 0;
       }
       return axisWithoutGrid;
-    }).entries(vegaAxes)
-    .map(d => d.value)
-    .sort((a,b) => (axesScales.indexOf(a.scale) - axesScales.indexOf(b.scale)));
+    },
+    axis => axis.scale
+  ).map(d => d[1])
+   .sort((a,b) => (axesScales.indexOf(a.scale) - axesScales.indexOf(b.scale)));
 }