Merge branch 'main' into fil/occlusion

Author: Fil

.github/workflows/deploy.yml

@@ -15,11 +15,11 @@ jobs:
       name: github-pages
       url: ${{ steps.deployment.outputs.page_url }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
-          cache: 'yarn'
+          node-version: 20
+          cache: yarn
       - run: yarn --frozen-lockfile
       - run: yarn prepublishOnly
       - run: yarn docs:build

.github/workflows/test.yml

@@ -10,11 +10,11 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v3
         with:
-          node-version: 16
-          cache: 'yarn'
+          node-version: 20
+          cache: yarn
       - run: yarn --frozen-lockfile
       - run: yarn test:mocha
       - run: yarn test:tsc

.mocharc.json

@@ -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:
 

docs/transforms/bin.md

@@ -177,7 +177,7 @@ Plot.plot({
 ```
 :::
 
-The dodge transform can be use with any mark that supports **x** and **y** position. Below, we use the [text mark](../marks/text.md) instead to show company valuations (in billions).
+The dodge transform can be used with any mark that supports **x** and **y** position. Below, we use the [text mark](../marks/text.md) instead to show company valuations (in billions).
 
 :::plot defer https://observablehq.com/@observablehq/plot-text-dodge
 ```js

docs/transforms/dodge.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:
 

docs/transforms/group.md

@@ -29,7 +29,7 @@
   "scripts": {
     "test": "yarn test:mocha && yarn test:tsc && yarn test:lint && yarn test:prettier",
     "test:coverage": "c8 yarn test:mocha",
-    "test:mocha": "mkdir -p test/output && TZ=America/Los_Angeles mocha 'test/**/*-test.*' 'test/plot.js'",
+    "test:mocha": "mkdir -p test/output && TZ=America/Los_Angeles tsx node_modules/.bin/mocha 'test/**/*-test.*' 'test/plot.*'",
     "test:lint": "eslint src test",
     "test:prettier": "prettier --check src test",
     "test:tsc": "tsc",
@@ -47,7 +47,6 @@
     "./src/plot.js"
   ],
   "devDependencies": {
-    "@esbuild-kit/core-utils": "^3.1.0",
     "@observablehq/runtime": "^5.7.3",
     "@rollup/plugin-commonjs": "^25.0.2",
     "@rollup/plugin-json": "^6.0.0",
@@ -62,20 +61,20 @@
     "canvas": "^2.0.0",
     "d3-geo-projection": "^4.0.0",
     "eslint": "^8.16.0",
-    "eslint-config-prettier": "^8.5.0",
-    "get-tsconfig": "^4.1.0",
+    "eslint-config-prettier": "^9.1.0",
     "htl": "^0.3.0",
     "js-beautify": "1",
-    "jsdom": "^22.1.0",
-    "markdown-it-container": "^3.0.0",
+    "jsdom": "^23.0.1",
+    "markdown-it-container": "^4.0.0",
     "mocha": "^10.0.0",
     "module-alias": "^2.0.0",
-    "prettier": "^3.0.0",
-    "rollup": "^3.7.0",
+    "prettier": "~3.0.0",
+    "rollup": "^4.9.1",
     "topojson-client": "^3.1.0",
-    "ts-morph": "^19.0.0",
+    "ts-morph": "^21.0.1",
+    "tsx": "^4.7.0",
     "typescript": "^5.0.2",
-    "vite": "^4.4.9",
+    "vite": "^5.0.10",
     "vitepress": "^1.0.0-rc.12"
   },
   "c8": {

loader.js

@@ -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

package.json

@@ -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}`);
 }