simplify: always compute scales

Author: Fil

src/plot.js

@@ -143,12 +143,12 @@ function autoHeight({y, fy, fx}) {
 
 // Wrap the plot in a figure with a caption, if desired.
 function wrap(svg, scaleDescriptors, {caption} = {}) {
-  const scales = (key) => exposeScales(scaleDescriptors, key);
+  const scales = exposeScales(scaleDescriptors);
   const legends = [];
   for (let key in scaleDescriptors) {
     const {legend} = scaleDescriptors[key];
     if (typeof legend === "function") {
-      const l = legend(scales(key));
+      const l = legend(scales[key]);
       if (l instanceof Node) legends.push(l);
     }
   }

src/scales.js

@@ -114,16 +114,11 @@ function asOrdinalType(key) {
 }
 
 // prepare scales for exposure through the plot's scales() function
-export function exposeScales(scaleDescriptors, key) {
-  if (key === undefined) {
-    return Object.fromEntries(
-      Object.entries(scaleDescriptors)
-      .map(([key, descriptor]) => [key, exposeScale(descriptor)])
-    );
-  }
-  if (key in scaleDescriptors) {
-    return exposeScale(scaleDescriptors[key]);
-  }
+export function exposeScales(scaleDescriptors) {
+  return Object.fromEntries(
+    Object.entries(scaleDescriptors)
+    .map(([key, descriptor]) => [key, exposeScale(descriptor)])
+  );
 }
 
 function exposeScale({scale, label}) {

test/scales/scales-test.js

@@ -4,17 +4,17 @@ import {JSDOM} from "jsdom";
 const {window} = new JSDOM("");
 global.document = window.document;
 
-tape("plot(…).scales() exposes the plot’s scales", test => {
+tape("plot(…).scales exposes the plot’s scales", test => {
   const plot = Plot.dot([1, 2], {x: d => d, y: d => d}).plot();
-  test.equal(typeof plot.scales, "function");
-  const scales = plot.scales();
+  test.equal(typeof plot.scales, "object");
+  const scales = plot.scales;
   test.equal(Object.entries(scales).length, 2);
   test.assert("x" in scales);
   test.assert("y" in scales);
 });
 
-tape("plot(…).scales('x') exposes the plot’s x scale", test => {
-  const x = Plot.dot([1, 2], {x: d => d}).plot().scales('x');
+tape("plot(…).scales.x exposes the plot’s x scale", test => {
+  const x = Plot.dot([1, 2], {x: d => d}).plot().scales.x;
   test.deepEqual(x.domain, [1, 2]);
   test.deepEqual(x.range, [20, 620]);
   test.equal(typeof x.interpolate, "function");
@@ -23,10 +23,10 @@ tape("plot(…).scales('x') exposes the plot’s x scale", test => {
   test.equal(typeof x.scale, "function");
 });
 
-tape("plot(…).scales('y') exposes the plot’s y scale", test => {
-  const y0 = Plot.dot([1, 2], {x: d => d}).plot().scales('y');
+tape("plot(…).scales.y exposes the plot’s y scale", test => {
+  const y0 = Plot.dot([1, 2], {x: d => d}).plot().scales.y;
   test.equal(y0, undefined);
-  const y = Plot.dot([1, 2], {y: d => d}).plot().scales('y');
+  const y = Plot.dot([1, 2], {y: d => d}).plot().scales.y;
   test.deepEqual(y.domain, [1, 2]);
   test.deepEqual(y.range, [380, 20]);
   test.equal(typeof y.interpolate, "function");
@@ -35,11 +35,11 @@ tape("plot(…).scales('y') exposes the plot’s y scale", test => {
   test.equal(typeof y.scale, "function");
 });
 
-tape("plot(…).scales('fx') exposes the plot’s fx scale", test => {
-  const fx0 = Plot.dot([1, 2], {x: d => d}).plot().scales('fx');
+tape("plot(…).scales.fx exposes the plot’s fx scale", test => {
+  const fx0 = Plot.dot([1, 2], {x: d => d}).plot().scales.fx;
   test.equal(fx0, undefined);
   const data = [1, 2];
-  const fx = Plot.dot(data, {y: d => d}).plot({facet: {data, x: data}}).scales('fx');
+  const fx = Plot.dot(data, {y: d => d}).plot({facet: {data, x: data}}).scales.fx;
   test.deepEqual(fx.domain, [1, 2]);
   test.deepEqual(fx.range, [40, 620]);
   test.equal(typeof fx.interpolate, "undefined");
@@ -48,11 +48,11 @@ tape("plot(…).scales('fx') exposes the plot’s fx scale", test => {
   test.equal(typeof fx.scale, "function");
 });
 
-tape("plot(…).scales('fy') exposes the plot’s fy scale", test => {
-  const fy0 = Plot.dot([1, 2], {x: d => d}).plot().scales('fy');
+tape("plot(…).scales.fy exposes the plot’s fy scale", test => {
+  const fy0 = Plot.dot([1, 2], {x: d => d}).plot().scales.fy;
   test.equal(fy0, undefined);
   const data = [1, 2];
-  const fy = Plot.dot(data, {y: d => d}).plot({facet: {data, y: data}}).scales('fy');
+  const fy = Plot.dot(data, {y: d => d}).plot({facet: {data, y: data}}).scales.fy;
   test.deepEqual(fy.domain, [1, 2]);
   test.deepEqual(fy.range, [20, 380]);
   test.equal(typeof fy.interpolate, "undefined");
@@ -61,11 +61,11 @@ tape("plot(…).scales('fy') exposes the plot’s fy scale", test => {
   test.equal(typeof fy.scale, "function");
 });
 
-tape("plot(…).scales('color') exposes a continuous color scale", test => {
-  const color0 = Plot.dot([1, 2], {x: d => d}).plot().scales('color');
+tape("plot(…).scales.color exposes a continuous color scale", test => {
+  const color0 = Plot.dot([1, 2], {x: d => d}).plot().scales.color;
   test.equal(color0, undefined);
   const data = [1, 2, 3, 4, 5];
-  const color = Plot.dot(data, {y: d => d, fill: d => d}).plot().scales('color');
+  const color = Plot.dot(data, {y: d => d, fill: d => d}).plot().scales.color;
   test.deepEqual(color.domain, [1, 5]);
   test.deepEqual(color.range, [0, 1]);
   test.equal(typeof color.interpolate, "function");
@@ -74,9 +74,9 @@ tape("plot(…).scales('color') exposes a continuous color scale", test => {
   test.equal(typeof color.scale, "function");
 });
 
-tape("plot(…).scales('color') exposes an ordinal color scale", test => {
+tape("plot(…).scales.color exposes an ordinal color scale", test => {
   const data = ["a", "b", "c", "d"];
-  const color = Plot.dot(data, {y: d => d, fill: d => d}).plot().scales('color');
+  const color = Plot.dot(data, {y: d => d, fill: d => d}).plot().scales.color;
   test.deepEqual(color.domain, data);
   test.deepEqual(color.range, ['#4e79a7', '#f28e2c', '#e15759', '#76b7b2', '#59a14f', '#edc949', '#af7aa1', '#ff9da7', '#9c755f', '#bab0ab']);
   test.equal(typeof color.interpolate, "undefined");
@@ -85,11 +85,11 @@ tape("plot(…).scales('color') exposes an ordinal color scale", test => {
   test.equal(typeof color.scale, "function");
 });
 
-tape("plot(…).scales('r') exposes a radius scale", test => {
-  const r0 = Plot.dot([1, 2], {x: d => d}).plot().scales('r');
+tape("plot(…).scales.r exposes a radius scale", test => {
+  const r0 = Plot.dot([1, 2], {x: d => d}).plot().scales.r;
   test.equal(r0, undefined);
   const data = [1, 2, 3, 4, 9];
-  const r = Plot.dot(data, {r: d => d}).plot().scales('r');
+  const r = Plot.dot(data, {r: d => d}).plot().scales.r;
   test.deepEqual(r.domain, [0, 9]);
   test.deepEqual(r.range, [0, Math.sqrt(40.5)]);
   test.equal(typeof r.interpolate, "function");
@@ -98,11 +98,11 @@ tape("plot(…).scales('r') exposes a radius scale", test => {
   test.equal(typeof r.scale, "function");
 });
 
-tape("plot(…).scales('opacity') exposes a linear scale", test => {
-  const opacity0 = Plot.dot([1, 2], {x: d => d}).plot().scales('opacity');
+tape("plot(…).scales.opacity exposes a linear scale", test => {
+  const opacity0 = Plot.dot([1, 2], {x: d => d}).plot().scales.opacity;
   test.equal(opacity0, undefined);
   const data = [1, 2, 3, 4, 9];
-  const opacity = Plot.dot(data, {fillOpacity: d => d}).plot().scales('opacity');
+  const opacity = Plot.dot(data, {fillOpacity: d => d}).plot().scales.opacity;
   test.deepEqual(opacity.domain, [0, 9]);
   test.deepEqual(opacity.range, [0, 1]);
   test.equal(typeof opacity.interpolate, "function");
@@ -133,19 +133,19 @@ tape("plot(…).scales expose label", test => {
 });
 
 tape("plot(…).scales expose color label", test => {
-  const x = Plot.dot([{x: 1}, {x: 2}, {x: 3}], {fill: "x"}).plot().scales("color");
+  const x = Plot.dot([{x: 1}, {x: 2}, {x: 3}], {fill: "x"}).plot().scales.color;
   test.equal(x.label, "x");
-  const y = Plot.dot([{x: 1}, {x: 2}, {x: 3}], {fill: "x"}).plot({color: {label: "y"}}).scales("color");
+  const y = Plot.dot([{x: 1}, {x: 2}, {x: 3}], {fill: "x"}).plot({color: {label: "y"}}).scales.color;
   test.equal(y.label, "y");
 });
 
 tape("plot(…).scales expose radius label", test => {
-  const x = Plot.dot([{x: 1}, {x: 2}, {x: 3}], {r: "x"}).plot().scales("r");
+  const x = Plot.dot([{x: 1}, {x: 2}, {x: 3}], {r: "x"}).plot().scales.r;
   test.equal(x.label, "x");
-  const r = Plot.dot([{x: 1}, {x: 2}, {x: 3}], {r: "x"}).plot({color: {label: "radius"}}).scales("color");
+  const r = Plot.dot([{x: 1}, {x: 2}, {x: 3}], {r: "x"}).plot({r: {label: "radius"}}).scales.r;
   test.equal(r.label, "radius");
 });
 
 function scaleOpt(x) {
-  return Plot.dot([{x: 1}, {x: 2}, {x: 3}], {x: "x"}).plot({x}).scales("x");
+  return Plot.dot([{x: 1}, {x: 2}, {x: 3}], {x: "x"}).plot({x}).scales.x;
 }