@andyreagan/hedotools 4.0.0 → 5.0.0

package/bundle.sh

@@ -1,7 +1,11 @@
 #!/usr/bin/env bash
 # Concatenate the D3 v4 sources into a single browser bundle for hedonometer.org.
 # Order matters: init.v4 defines the `hedotools` namespace + helpers first, and
-# the dashboard modules (barchart/lens/map/sankey) depend on the shifter.
+# the dashboard modules (barchart/lens/map/sankey) depend on hedotools.shifter.
+#
+# NOTE: hedotools.shifter.js only adapts the @andyreagan/d3-shifterator package
+# into hedotools.shifter — the page must load D3 v4 and the d3-shifterator UMD
+# bundle (global `shifterator`) BEFORE this bundle.
 set -euo pipefail
 cd "$(dirname "$0")/js"
 
@@ -12,7 +16,7 @@ cat \
   hedotools.lens.js \
   hedotools.map.js \
   hedotools.sankey.js \
-  hedotools.shifter.v4.js \
+  hedotools.shifter.js \
   > hedotools.v4.js
 
 echo "built js/hedotools.v4.js"

package/js/hedotools.sankey.js

@@ -343,12 +343,12 @@ hedotools.sankey = function() {
 			console.log(compfile);
 			var refF;
 			var compF;
-			d3.text(reffile,function(text) {
+			d3.text(reffile).then(function(text) {
 			    refF = text.split(",");
 			    console.log(refF);
 			    if (!--csvLoadsRemaining) drawShift();
 			});
-			d3.text(compfile,function(text) {
+			d3.text(compfile).then(function(text) {
 			    compF = text.split(",");
 			    console.log(compF);
 			    if (!--csvLoadsRemaining) drawShift();

package/js/hedotools.shifter.js

@@ -0,0 +1,27 @@
+// hedotools.shifter — the wordshift graph.
+//
+// As of v4.5 this is no longer implemented here; it lives in its own package,
+// @andyreagan/d3-shifterator (extracted from this repo's old shifter.v4.js).
+// We instantiate that package's factory once and expose it as the shared
+// `hedotools.shifter` singleton that the dashboard modules (barchart, lens,
+// map, sankey) drive via .shift(refF, compF, lens, words) and
+// .setfigure(...).setText(...).plot().
+//
+// Load order on the page (and in bundle.sh): D3 v4, then the d3-shifterator
+// UMD bundle (which defines the global `shifterator`), then this file.
+//
+// One compatibility shim: the dashboard modules call
+//     setfigure(d3.select('#shift01'))
+// passing a d3 SELECTION (the old hedotools.shifter API). d3-shifterator's
+// setfigure expects a selector string or node (it runs d3.select() on its
+// argument). Normalize a selection down to its node so both styles work.
+hedotools.shifter = (function () {
+    var instance = shifterator.shifterator();
+    var setfigure = instance.setfigure;
+    instance.setfigure = function (_) {
+        var arg = (_ && typeof _.node === "function") ? _.node() : _;
+        setfigure.call(instance, arg);
+        return instance;
+    };
+    return instance;
+})();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@andyreagan/hedotools",
-  "version": "4.0.0",
-  "description": "A collection of D3.js tools in use at hedonometer.org: word shifts, choropleth maps, sankey diagrams, a frequency lens, and bar charts. Version tracks the supported D3 major version (4.x = D3 v4).",
+  "version": "5.0.0",
+  "description": "A collection of D3.js tools in use at hedonometer.org: word shifts (via @andyreagan/d3-shifterator), choropleth maps, sankey diagrams, a frequency lens, and bar charts. Version tracks the supported D3 major version (5.x = D3 v5).",
   "author": "Andy Reagan",
   "license": "BSD-2-Clause",
   "scripts": {
@@ -32,9 +32,8 @@
     "vitest": "3.2.6"
   },
   "dependencies": {
-    "d3": "^4.13.0",
-    "d3-selection": "^1.3.0",
-    "d3-selection-multi": "^1.0.1",
+    "@andyreagan/d3-shifterator": "^5.0.0",
+    "d3": "^5.16.0",
     "jquery": "^3.5.1",
     "topojson-client": "^3.1.0"
   }