d3 7.9.0 (#2020)

* d3 7.9.0

* fix circular imports

* d3@^7.9.0

* fix yarn.lock

* remove unused import

package.json

@@ -55,23 +55,23 @@
     "@types/d3": "^7.4.0",
     "@types/mocha": "^10.0.1",
     "@types/node": "^20.5.0",
-    "@typescript-eslint/eslint-plugin": "^6.0.0",
-    "@typescript-eslint/parser": "^6.0.0",
-    "c8": "^8.0.1",
+    "@typescript-eslint/eslint-plugin": "^7.2.0",
+    "@typescript-eslint/parser": "^7.2.0",
+    "c8": "^9.1.0",
     "canvas": "^2.0.0",
     "d3-geo-projection": "^4.0.0",
     "eslint": "^8.16.0",
     "eslint-config-prettier": "^9.1.0",
     "htl": "^0.3.0",
     "js-beautify": "1",
-    "jsdom": "^23.0.1",
+    "jsdom": "^24.0.0",
     "markdown-it-container": "^4.0.0",
     "mocha": "^10.0.0",
     "module-alias": "^2.0.0",
     "prettier": "~3.0.0",
     "rollup": "^4.9.1",
     "topojson-client": "^3.1.0",
-    "ts-morph": "^21.0.1",
+    "ts-morph": "^22.0.0",
     "tsx": "^4.7.0",
     "typescript": "^5.0.2",
     "vite": "^5.0.10",
@@ -88,7 +88,7 @@
     ]
   },
   "dependencies": {
-    "d3": "^7.8.0",
+    "d3": "^7.9.0",
     "interval-tree-1d": "^1.0.0",
     "isoformat": "^0.2.0"
   },

src/context.js

@@ -1,5 +1,5 @@
 import {creator, select} from "d3";
-import {maybeClip} from "./style.js";
+import {maybeClip} from "./options.js";
 
 export function createContext(options = {}) {
   const {document = typeof window !== "undefined" ? window.document : undefined, clip} = options;

src/mark.js

@@ -1,10 +1,10 @@
 import {channelDomain, createChannels, valueObject} from "./channel.js";
 import {defined} from "./defined.js";
 import {maybeFacetAnchor} from "./facet.js";
-import {maybeNamed, maybeValue} from "./options.js";
+import {maybeClip, maybeNamed, maybeValue} from "./options.js";
 import {arrayify, isDomainSort, isObject, isOptions, keyword, range, singleton} from "./options.js";
 import {project} from "./projection.js";
-import {maybeClip, styles} from "./style.js";
+import {styles} from "./style.js";
 import {basic, initializer} from "./transforms/basic.js";
 
 export class Mark {

src/options.js

@@ -1,4 +1,4 @@
-import {descending, quantile, range as rangei} from "d3";
+import {quantile, range as rangei} from "d3";
 import {parse as isoParse} from "isoformat";
 import {defined} from "./defined.js";
 import {maybeTimeInterval, maybeUtcInterval} from "./time.js";
@@ -510,16 +510,6 @@ export function maybeFrameAnchor(value = "middle") {
   return maybeAnchor(value, "frameAnchor");
 }
 
-// Like a sort comparator, returns a positive value if the given array of values
-// is in ascending order, a negative value if the values are in descending
-// order. Assumes monotonicity; only tests the first and last values.
-export function orderof(values) {
-  if (values == null) return;
-  const first = values[0];
-  const last = values[values.length - 1];
-  return descending(first, last);
-}
-
 // Unlike {...defaults, ...options}, this ensures that any undefined (but
 // present) properties in options inherit the given default value.
 export function inherit(options = {}, ...rest) {
@@ -557,3 +547,12 @@ export function named(things) {
 export function maybeNamed(things) {
   return isIterable(things) ? named(things) : things;
 }
+
+// TODO Accept other types of clips (paths, urls, x, y, other marks…)?
+// https://github.com/observablehq/plot/issues/181
+export function maybeClip(clip) {
+  if (clip === true) clip = "frame";
+  else if (clip === false) clip = null;
+  else if (clip != null) clip = keyword(clip, "clip", ["frame", "sphere"]);
+  return clip;
+}

src/order.js

@@ -0,0 +1,11 @@
+import {descending} from "d3";
+
+// Like a sort comparator, returns a positive value if the given array of values
+// is in ascending order, a negative value if the values are in descending
+// order. Assumes monotonicity; only tests the first and last values.
+export function orderof(values) {
+  if (values == null) return;
+  const first = values[0];
+  const last = values[values.length - 1];
+  return descending(first, last);
+}

src/scales.js

@@ -5,11 +5,11 @@ import {
   isNumericString,
   isScaleOptions,
   map,
-  orderof,
   slice,
   coerceNumbers,
   coerceDates
 } from "./options.js";
+import {orderof} from "./order.js";
 import {registry, color, position, radius, opacity, symbol, length} from "./scales/index.js";
 import {
   createScaleLinear,

src/scales/quantitative.js

@@ -24,7 +24,8 @@ import {
   ticks
 } from "d3";
 import {finite, negative, positive} from "../defined.js";
-import {arrayify, constant, maybeNiceInterval, maybeRangeInterval, orderof, slice} from "../options.js";
+import {arrayify, constant, maybeNiceInterval, maybeRangeInterval, slice} from "../options.js";
+import {orderof} from "../order.js";
 import {color, length, opacity, radius, registry, hasNumericRange} from "./index.js";
 import {ordinalRange, quantitativeScheme} from "./schemes.js";
 

src/scales/schemes.js

@@ -48,6 +48,7 @@ import {
   schemeGnBu,
   schemeGreens,
   schemeGreys,
+  schemeObservable10,
   schemeOranges,
   schemeOrRd,
   schemePaired,
@@ -77,20 +78,6 @@ import {
   schemeYlOrRd
 } from "d3";
 
-// TODO https://github.com/d3/d3-scale-chromatic/pull/51
-const schemeObservable10 = [
-  "#4269d0",
-  "#efb118",
-  "#ff725c",
-  "#6cc5b0",
-  "#3ca951",
-  "#ff8ab7",
-  "#a463f2",
-  "#97bbf5",
-  "#9c6b4e",
-  "#9498a0"
-];
-
 const categoricalSchemes = new Map([
   ["accent", schemeAccent],
   ["category10", schemeCategory10],

src/style.js

@@ -3,7 +3,7 @@ import {create} from "./context.js";
 import {defined, nonempty} from "./defined.js";
 import {formatDefault} from "./format.js";
 import {isNone, isNoneish, isRound, maybeColorChannel, maybeNumberChannel} from "./options.js";
-import {keyof, keyword, number, string} from "./options.js";
+import {keyof, number, string} from "./options.js";
 import {warn} from "./warnings.js";
 
 export const offset = (typeof window !== "undefined" ? window.devicePixelRatio > 1 : typeof it === "undefined") ? 0 : 0.5; // prettier-ignore
@@ -297,15 +297,6 @@ export function* groupIndex(I, position, mark, channels) {
   }
 }
 
-// TODO Accept other types of clips (paths, urls, x, y, other marks…)?
-// https://github.com/observablehq/plot/issues/181
-export function maybeClip(clip) {
-  if (clip === true) clip = "frame";
-  else if (clip === false) clip = null;
-  else if (clip != null) clip = keyword(clip, "clip", ["frame", "sphere"]);
-  return clip;
-}
-
 // Note: may mutate selection.node!
 function applyClip(selection, mark, dimensions, context) {
   let clipUrl;

src/time.js

@@ -3,7 +3,7 @@ import {utcSecond, utcMinute, utcHour, unixDay, utcWeek, utcMonth, utcYear} from
 import {utcMonday, utcTuesday, utcWednesday, utcThursday, utcFriday, utcSaturday, utcSunday} from "d3";
 import {timeSecond, timeMinute, timeHour, timeDay, timeWeek, timeMonth, timeYear} from "d3";
 import {timeMonday, timeTuesday, timeWednesday, timeThursday, timeFriday, timeSaturday, timeSunday} from "d3";
-import {orderof} from "./options.js";
+import {orderof} from "./order.js";
 
 const durationSecond = 1000;
 const durationMinute = durationSecond * 60;