Remove autoImpl and return more from autoSpec (#1504)

* Remove autoImpl and return more from autoSpec

* object to dry identifier/name conversion

---------

Co-authored-by: Mike Bostock <[email protected]>

Author: tophtucker

src/marks/auto.js

@@ -13,11 +13,6 @@ import {rectX, rectY} from "./rect.js";
 import {ruleX, ruleY} from "./rule.js";
 
 export function autoSpec(data, options) {
-  const {x, y, fx, fy, color, size, mark} = autoImpl(data, options);
-  return {x, y, fx, fy, color, size, mark};
-}
-
-function autoImpl(data, options) {
   options = normalizeOptions(options);
 
   // Greedily materialize columns for type inference; we’ll need them anyway to
@@ -202,27 +197,27 @@ function autoImpl(data, options) {
       reduce: sizeReduce ?? null
     },
     mark,
-    markImpl,
+    markImpl: implNames[markImpl],
     markOptions,
-    transformImpl,
+    transformImpl: implNames[transformImpl],
     transformOptions,
     colorMode
   };
 }
 
 export function auto(data, options) {
+  const spec = autoSpec(data, options);
   const {
     fx,
     fy,
     x: {zero: xZero},
     y: {zero: yZero},
-    markImpl,
     markOptions,
-    transformImpl,
     transformOptions,
     colorMode
-  } = autoImpl(data, options);
-
+  } = spec;
+  const markImpl = impls[spec.markImpl];
+  const transformImpl = impls[spec.transformImpl];
   // In the case of filled marks (particularly bars and areas) the frame and
   // rules should come after the mark; in the case of stroked marks
   // (particularly dots and lines) they should come before the mark.
@@ -333,3 +328,33 @@ function isReducer(reduce) {
 function isHighCardinality(value) {
   return value ? new InternSet(value).size > value.length >> 1 : false;
 }
+
+const impls = {
+  dot,
+  line,
+  lineX,
+  lineY,
+  areaX,
+  areaY,
+  ruleX,
+  ruleY,
+  barX,
+  barY,
+  rectX,
+  rectY,
+  cell,
+  bin,
+  binX,
+  binY,
+  group,
+  groupX,
+  groupY
+};
+
+// Instead of returning the mark or transform implementation directly, we return
+// the implementation name to facilitate code compilation (“eject to explicit
+// marks”). An implementation-to-name mapping needs to live somewhere for
+// compilation, and by having it in Plot we can more easily introduce a new mark
+// or transform implementation in Plot.auto without having to synchronize a
+// downstream change in the compiler.
+const implNames = Object.fromEntries(Object.entries(impls).map(([name, impl]) => [impl, name]));

test/marks/auto-test.js

@@ -10,7 +10,20 @@ it("Plot.autoSpec makes a histogram from a quantitative dimension", () => {
     y: {value: null, reduce: "count", zero: true},
     color: {value: null, reduce: null},
     size: {value: null, reduce: null},
-    mark: "bar"
+    mark: "bar",
+    markImpl: "rectY",
+    markOptions: {
+      fx: undefined,
+      fy: undefined,
+      x: {value: Object.assign([1, 1, 38], {label: "value"})},
+      y: undefined,
+      fill: undefined,
+      z: undefined,
+      r: undefined
+    },
+    transformImpl: "binX",
+    transformOptions: {fill: undefined, r: undefined, y: "count"},
+    colorMode: "fill"
   });
 });
 
@@ -23,7 +36,20 @@ it("Plot.autoSpec makes a bar chart from an ordinal dimension", () => {
     y: {value: null, reduce: "count", zero: true},
     color: {value: null, reduce: null, color: "blue"},
     size: {value: null, reduce: null},
-    mark: "bar"
+    mark: "bar",
+    markImpl: "barY",
+    markOptions: {
+      fx: undefined,
+      fy: undefined,
+      x: Object.assign(["duck", "duck", "goose"], {label: "value"}),
+      y: undefined,
+      fill: "blue",
+      z: undefined,
+      r: undefined
+    },
+    transformImpl: "groupX",
+    transformOptions: {fill: undefined, r: undefined, y: "count"},
+    colorMode: "fill"
   });
 });
 
@@ -40,7 +66,20 @@ it("Plot.autoSpec makes a line from a monotonic dimension", () => {
     y: {value: "value", reduce: null, zero: false},
     color: {value: null, reduce: null},
     size: {value: null, reduce: null},
-    mark: "line"
+    mark: "line",
+    markImpl: "line",
+    markOptions: {
+      fx: undefined,
+      fy: undefined,
+      x: Object.assign([1, 2, 3], {label: "date"}),
+      y: Object.assign([1, 1, 38], {label: "value"}),
+      stroke: undefined,
+      z: undefined,
+      r: undefined
+    },
+    transformImpl: undefined,
+    transformOptions: {stroke: undefined, r: undefined},
+    colorMode: "stroke"
   });
 });
 
@@ -57,7 +96,20 @@ it("Plot.autoSpec makes a dot plot from two quantitative dimensions", () => {
     y: {value: "y", reduce: null, zero: false},
     color: {value: null, reduce: null},
     size: {value: null, reduce: null},
-    mark: "dot"
+    mark: "dot",
+    markImpl: "dot",
+    markOptions: {
+      fx: undefined,
+      fy: undefined,
+      x: Object.assign([0, 2, 1], {label: "x"}),
+      y: Object.assign([0, 3, 2], {label: "y"}),
+      stroke: undefined,
+      z: undefined,
+      r: undefined
+    },
+    transformImpl: undefined,
+    transformOptions: {stroke: undefined, r: undefined},
+    colorMode: "stroke"
   });
 });
 
@@ -77,6 +129,19 @@ it("Plot.autoSpec makes a faceted heatmap", () => {
     y: {value: "y", reduce: null, zero: false},
     color: {value: null, reduce: "count"},
     size: {value: null, reduce: null},
-    mark: "bar"
+    mark: "bar",
+    markImpl: "rectY",
+    markOptions: {
+      fx: undefined,
+      fy: "f",
+      x: {value: Object.assign([0, 2, 1, 4, 2, 4], {label: "x"})},
+      y: {value: Object.assign([0, 3, 2, 1, 6, 2], {label: "y"})},
+      fill: undefined,
+      z: undefined,
+      r: undefined
+    },
+    transformImpl: "bin",
+    transformOptions: {fill: "count", r: undefined},
+    colorMode: "fill"
   });
 });