isIterable

mbostock · mbostock · commit 5371fade770b · 2022-05-31T16:53:52.000-07:00
diff --git a/src/channel.js b/src/channel.js
@@ -1,6 +1,6 @@
 import {ascending, descending, rollup, sort} from "d3";
 import {ascendingDefined, descendingDefined} from "./defined.js";
-import {first, labelof, map, maybeValue, range, valueof} from "./options.js";
+import {first, isIterable, labelof, map, maybeValue, range, valueof} from "./options.js";
 import {registry} from "./scales/index.js";
 import {maybeReduce} from "./transforms/group.js";
 import {composeInitializer} from "./transforms/initializer.js";
@@ -49,7 +49,7 @@ export function channelDomain(channels, facetChannels, data, options) {
     const X = findScaleChannel(channels, x) || facetChannels && findScaleChannel(facetChannels, x);
     if (!X) throw new Error(`missing channel for scale: ${x}`);
     const XV = X.value;
-    const [lo = 0, hi = Infinity] = limit && typeof limit[Symbol.iterator] === "function" ? limit : limit < 0 ? [limit] : [0, limit];
+    const [lo = 0, hi = Infinity] = isIterable(limit) ? limit : limit < 0 ? [limit] : [0, limit];
     if (y == null) {
       X.domain = () => {
         let domain = XV;
diff --git a/src/marks/text.js b/src/marks/text.js
@@ -1,7 +1,7 @@
 import {create, namespaces} from "d3";
 import {nonempty} from "../defined.js";
 import {formatDefault} from "../format.js";
-import {indexOf, identity, string, maybeNumberChannel, maybeTuple, numberChannel, isNumeric, isTemporal, keyword, maybeFrameAnchor, isTextual} from "../options.js";
+import {indexOf, identity, string, maybeNumberChannel, maybeTuple, numberChannel, isNumeric, isTemporal, keyword, maybeFrameAnchor, isTextual, isIterable} from "../options.js";
 import {Mark} from "../plot.js";
 import {applyChannelStyles, applyDirectStyles, applyIndirectStyles, applyAttr, applyTransform, offset, impliedString, applyFrameAnchor} from "../style.js";
 import {maybeIntervalMidX, maybeIntervalMidY} from "../transforms/interval.js";
@@ -18,7 +18,7 @@ export class Text extends Mark {
     const {
       x,
       y,
-      text = data != null && isTextual(data) ? identity : indexOf,
+      text = isIterable(data) && isTextual(data) ? identity : indexOf,
       frameAnchor,
       textAnchor = /right$/i.test(frameAnchor) ? "end" : /left$/i.test(frameAnchor) ? "start" : "middle",
       lineAnchor = /^top/i.test(frameAnchor) ? "top" : /^bottom/i.test(frameAnchor) ? "bottom" : "middle",
diff --git a/src/options.js b/src/options.js
@@ -228,6 +228,10 @@ export function numberChannel(source) {
   };
 }
 
+export function isIterable(value) {
+  return value && typeof value[Symbol.iterator] === "function";
+}
+
 export function isTextual(values) {
   for (const value of values) {
     if (value == null) continue;
diff --git a/src/transforms/bin.js b/src/transforms/bin.js
@@ -1,5 +1,5 @@
 import {bin as binner, extent, thresholdFreedmanDiaconis, thresholdScott, thresholdSturges, utcTickInterval} from "d3";
-import {valueof, range, identity, maybeColumn, maybeTuple, maybeColorChannel, maybeValue, mid, labelof, isTemporal} from "../options.js";
+import {valueof, range, identity, maybeColumn, maybeTuple, maybeColorChannel, maybeValue, mid, labelof, isTemporal, isIterable} from "../options.js";
 import {coerceDate, coerceNumber} from "../scales.js";
 import {basic} from "./basic.js";
 import {hasOutput, maybeEvaluator, maybeGroup, maybeOutput, maybeOutputs, maybeReduce, maybeSort, maybeSubgroup, reduceCount, reduceFirst, reduceIdentity} from "./group.js";
@@ -259,7 +259,7 @@ function thresholdAuto(values, min, max) {
 }
 
 function isTimeThresholds(t) {
-  return isTimeInterval(t) || t && t[Symbol.iterator] && isTemporal(t);
+  return isTimeInterval(t) || (isIterable(t) && isTemporal(t));
 }
 
 function isTimeInterval(t) {
diff --git a/test/marks/text-test.js b/test/marks/text-test.js
@@ -101,3 +101,9 @@ it("text(data, {fontSize}) allows fontSize to be a channel", () => {
   assert.strictEqual(text.fontSize, undefined);
   assert.strictEqual(text.channels.find(c => c.name === "fontSize").value, "x");
 });
+
+it("text({length}) can take length-only data", () => {
+  const data = {length: 100};
+  const text = Plot.text(data);
+  assert.strictEqual(text.data, data);
+});

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`import {bin as binner, extent, thresholdFreedmanDiaconis, thresholdScott, thresholdSturges, utcTickInterval} from "d3";`
`2`		`-import {valueof, range, identity, maybeColumn, maybeTuple, maybeColorChannel, maybeValue, mid, labelof, isTemporal} from "../options.js";`
	`2`	`+import {valueof, range, identity, maybeColumn, maybeTuple, maybeColorChannel, maybeValue, mid, labelof, isTemporal, isIterable} from "../options.js";`
`3`	`3`	`import {coerceDate, coerceNumber} from "../scales.js";`
`4`	`4`	`import {basic} from "./basic.js";`
`5`	`5`	`import {hasOutput, maybeEvaluator, maybeGroup, maybeOutput, maybeOutputs, maybeReduce, maybeSort, maybeSubgroup, reduceCount, reduceFirst, reduceIdentity} from "./group.js";`
`@@ -259,7 +259,7 @@ function thresholdAuto(values, min, max) {`
`259`	`259`	`}`
`260`	`260`
`261`	`261`	`function isTimeThresholds(t) {`
`262`		`- return isTimeInterval(t) \|\| t && t[Symbol.iterator] && isTemporal(t);`
	`262`	`+ return isTimeInterval(t) \|\| (isIterable(t) && isTemporal(t));`
`263`	`263`	`}`
`264`	`264`
`265`	`265`	`function isTimeInterval(t) {`