preserve group input order (#1959)

* preserve group input order * sort: "z"; fix tests * reduce z docs * fix tests * Update docs/transforms/group.md Co-authored-by: Philippe Rivière <[email protected]> --------- Co-authored-by: Philippe Rivière <[email protected]>
observablehq · Dec 27, 2023 · b5366f9 · b5366f9
1 parent 3a9581b
commit b5366f9
Show file tree

Hide file tree

Showing 70 changed files with 2,313 additions and 2,299 deletions.
diff --git a/docs/transforms/bin.md b/docs/transforms/bin.md
@@ -274,6 +274,7 @@ The following named reducers are supported:
 * *y* - the middle of the bin’s *y* extent (when binning on *y*)
 * *y1* - the lower bound of the bin’s *y* extent (when binning on *y*)
 * *y2* - the upper bound of the bin’s *y* extent (when binning on *y*)
+* *z* <VersionBadge pr="1959" /> - the bin’s *z* value (*z*, *fill*, or *stroke*)
 
 In addition, a reducer may be specified as:
 

diff --git a/docs/transforms/group.md b/docs/transforms/group.md
@@ -329,7 +329,7 @@ Although barX applies an implicit stackX transform, [textX](../marks/text.md) do
 
 ## Group options
 
-Given input *data* = [*d₀*, *d₁*, *d₂*, …], by default the resulting grouped data is an array of arrays where each inner array is a subset of the input data such as [[*d₁*, *d₂*, …], [*d₀*, …], …]. Each inner array is in input order. The outer array is in natural ascending order according to the associated dimension (*x* then *y*).
+Given input *data* = [*d₀*, *d₁*, *d₂*, …], by default the resulting grouped data is an array of arrays where each inner array is a subset of the input data such as [[*d₁*, *d₂*, …], [*d₀*, …], …]. Each inner array is in input order. The outer array is in input order according to the first element of each group.
 
 By specifying a different reducer for the **data** output, as described below, you can change how the grouped data is computed. The outputs may also include **filter** and **sort** options specified as reducers, and a **reverse** option to reverse the order of generated groups. By default, empty groups are omitted, and non-empty groups are generated in ascending (natural) order.
 
@@ -370,6 +370,7 @@ The following named reducers are supported:
 * *identity* - the array of values
 * *x* <VersionBadge version="0.6.12" pr="1916" /> - the group’s *x* value (when grouping on *x*)
 * *y* <VersionBadge version="0.6.12" pr="1916" /> - the group’s *y* value (when grouping on *y*)
+* *z* <VersionBadge pr="1959" /> - the group’s *z* value (*z*, *fill*, or *stroke*)
 
 In addition, a reducer may be specified as:
 

diff --git a/src/transforms/bin.d.ts b/src/transforms/bin.d.ts
@@ -117,6 +117,7 @@ export interface BinOptions {
  * - *y* - the middle of the bin’s **y** extent (when binning on **y**)
  * - *y1* - the lower bound of the bin’s **y** extent (when binning on **y**)
  * - *y2* - the upper bound of the bin’s **y** extent (when binning on **y**)
+ * - *z* - the bin’s **z** value (when grouping on **z**, **fill**, or **stroke**)
  * - a function that takes an array of values and returns the reduced value
  * - an object that implements the *reduceIndex* method
  *
@@ -132,7 +133,8 @@ export type BinReducer =
   | "x2"
   | "y"
   | "y1"
-  | "y2";
+  | "y2"
+  | "z";
 
 /**
  * A shorthand functional bin reducer implementation: given an array of input

diff --git a/src/transforms/bin.js b/src/transforms/bin.js
@@ -41,7 +41,8 @@ import {
   maybeSubgroup,
   reduceCount,
   reduceFirst,
-  reduceIdentity
+  reduceIdentity,
+  reduceZ
 } from "./group.js";
 import {maybeInsetX, maybeInsetY} from "./inset.js";
 
@@ -180,6 +181,7 @@ function binn(
         for (const [f, I] of maybeGroup(facet, G)) {
           for (const [k, g] of maybeGroup(I, K)) {
             for (const [b, extent] of bin(g)) {
+              if (G) extent.z = f;
               if (filter && !filter.reduce(b, extent)) continue;
               groupFacet.push(i++);
               groupData.push(reduceData.reduceIndex(b, data, extent));
@@ -190,7 +192,7 @@ function binn(
               if (BX1) BX1.push(extent.x1), BX2.push(extent.x2);
               if (BY1) BY1.push(extent.y1), BY2.push(extent.y2);
               for (const o of outputs) o.reduce(b, extent);
-              if (sort) sort.reduce(b);
+              if (sort) sort.reduce(b, extent);
             }
           }
         }
@@ -355,6 +357,8 @@ function maybeBinReduceFallback(reduce) {
       return reduceY1;
     case "y2":
       return reduceY2;
+    case "z":
+      return reduceZ;
   }
   throw new Error(`invalid bin reduce: ${reduce}`);
 }

diff --git a/src/transforms/group.d.ts b/src/transforms/group.d.ts
@@ -44,13 +44,14 @@ export interface GroupOutputOptions<T = Reducer> {
  * - a generic reducer name, such as *count* or *first*
  * - *x* - the group’s **x** value (when grouping on **x**)
  * - *y* - the group’s **y** value (when grouping on **y**)
+ * - *z* - the group’s **z** value (when grouping on **z**, **fill**, or **stroke**)
  * - a function that takes an array of values and returns the reduced value
  * - an object that implements the *reduceIndex* method
  *
  * When a reducer function or implementation is used with the group transform,
  * it is passed the group extent {x, y} as an additional argument.
  */
-export type GroupReducer = Reducer | GroupReducerFunction | GroupReducerImplementation | "x" | "y";
+export type GroupReducer = Reducer | GroupReducerFunction | GroupReducerImplementation | "x" | "y" | "z";
 
 /**
  * A shorthand functional group reducer implementation: given an array of input

diff --git a/src/transforms/group.js b/src/transforms/group.js
@@ -17,7 +17,6 @@ import {
 import {ascendingDefined} from "../defined.js";
 import {
   column,
-  first,
   identity,
   isObject,
   isTemporal,
@@ -137,6 +136,7 @@ function groupn(
               const extent = {data};
               if (X) extent.x = x;
               if (Y) extent.y = y;
+              if (G) extent.z = f;
               if (filter && !filter.reduce(g, extent)) continue;
               groupFacet.push(i++);
               groupData.push(reduceData.reduceIndex(g, data, extent));
@@ -230,12 +230,7 @@ export function maybeEvaluator(name, reduce, inputs, asReduce = maybeReduce) {
 }
 
 export function maybeGroup(I, X) {
-  return X
-    ? sort(
-        grouper(I, (i) => X[i]),
-        first
-      )
-    : [[, I]];
+  return X ? grouper(I, (i) => X[i]) : [[, I]];
 }
 
 export function maybeReduce(reduce, value, fallback = invalidReduce) {
@@ -309,6 +304,8 @@ function maybeGroupReduceFallback(reduce) {
       return reduceX;
     case "y":
       return reduceY;
+    case "z":
+      return reduceZ;
   }
   throw new Error(`invalid group reduce: ${reduce}`);
 }
@@ -437,6 +434,12 @@ const reduceY = {
   }
 };
 
+export const reduceZ = {
+  reduceIndex(I, X, {z}) {
+    return z;
+  }
+};
+
 export function find(test) {
   if (typeof test !== "function") throw new Error(`invalid test function: ${test}`);
   return {

diff --git a/test/output/athletesBirthdays.svg b/test/output/athletesBirthdays.svg