inline maybe

Author: mbostock

src/marks/auto.js

@@ -115,28 +115,28 @@ export function autoSpec(data, options) {
     case "bar":
       markImpl =
         colorReduce != null || sizeReduce != null // bin or group on both x and y
-          ? maybeIsOrdinal(X) && maybeIsOrdinal(Y)
+          ? X && isOrdinal(X) && Y && isOrdinal(Y)
             ? cell
-            : maybeIsOrdinal(X)
+            : X && isOrdinal(X)
             ? barY
-            : maybeIsOrdinal(Y)
+            : Y && isOrdinal(Y)
             ? barX
             : rect
           : xReduce != null // bin or group on y
           ? isOrdinal(Y)
-            ? isSelectReducer(xReduce) && maybeIsOrdinal(X)
+            ? isSelectReducer(xReduce) && X && isOrdinal(X)
               ? cell
               : barX
             : rectX
           : yReduce != null // bin or group on x
           ? isOrdinal(X)
-            ? isSelectReducer(yReduce) && maybeIsOrdinal(Y)
+            ? isSelectReducer(yReduce) && Y && isOrdinal(Y)
               ? cell
               : barY
             : rectY
-          : maybeIsNumeric(X) && !maybeIsNumeric(Y)
+          : X && isNumeric(X) && !(Y && isNumeric(Y))
           ? barX // if y is temporal, treat as ordinal
-          : maybeIsNumeric(Y) && !maybeIsNumeric(X)
+          : Y && isNumeric(Y) && !(X && isNumeric(X))
           ? barY // if x is temporal, treat as ordinal
           : cell;
       colorMode = "fill";
@@ -305,16 +305,6 @@ function isSelectReducer(reduce) {
   return /^(?:first|last|mode)$/i.test(reduce);
 }
 
-// We can’t infer the type of a custom reducer without invoking it, so
-// assume most reducers produce quantitative values.
-function maybeIsOrdinal(values) {
-  return values != null && isOrdinal(values);
-}
-
-function maybeIsNumeric(values) {
-  return values != null && isNumeric(values);
-}
-
 // https://github.com/observablehq/plot/blob/818562649280e155136f730fc496e0b3d15ae464/src/transforms/group.js#L236
 function isReducer(reduce) {
   if (reduce == null) return false;