fix regression (#1244)

* fix a regression where scales defined by a domain or a type (with default domain) where considered absent

* adopt isScaleOptions

---------

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

Author: Fil

src/plot.js

@@ -474,15 +474,15 @@ function inferAxes(marks, channelsByScale, options) {
     grid,
     facet = {},
     facet: {axis: facetAxis = axis, grid: facetGrid} = facet,
-    x: {type: xType = hasScale(marks, "x"), axis: xAxis = axis, grid: xGrid = xAxis === null ? null : grid} = x,
-    y: {type: yType = hasScale(marks, "y"), axis: yAxis = axis, grid: yGrid = yAxis === null ? null : grid} = y,
+    x: {axis: xAxis = axis, grid: xGrid = xAxis === null ? null : grid} = x,
+    y: {axis: yAxis = axis, grid: yGrid = yAxis === null ? null : grid} = y,
     fx: {axis: fxAxis = facetAxis, grid: fxGrid = fxAxis === null ? null : facetGrid} = fx,
     fy: {axis: fyAxis = facetAxis, grid: fyGrid = fyAxis === null ? null : facetGrid} = fy
   } = options;
 
   // Disable axes if the corresponding scale is not present.
-  if (projection || !xType) xAxis = xGrid = null;
-  if (projection || !yType) yAxis = yGrid = null;
+  if (projection || (!isScaleOptions(x) && !hasScaleChannel("x", marks))) xAxis = xGrid = null;
+  if (projection || (!isScaleOptions(y) && !hasScaleChannel("y", marks))) yAxis = yGrid = null;
   if (!channelsByScale.has("fx")) fxAxis = fxGrid = null;
   if (!channelsByScale.has("fy")) fyAxis = fyGrid = null;
 
@@ -608,7 +608,7 @@ function hasAxis(marks, k) {
   return marks.some((m) => m.ariaLabel?.startsWith(prefix));
 }
 
-function hasScale(marks, k) {
+function hasScaleChannel(k, marks) {
   for (const mark of marks) {
     for (const key in mark.channels) {
       if (mark.channels[key].scale === k) {

test/output/frameSides.svg

@@ -0,0 +1,28 @@
+import * as Plot from "@observablehq/plot";
+
+export async function frameCorners() {
+  return Plot.frame({rx: 16, ry: 10}).plot();
+}
+
+const marks = [
+  Plot.frame({anchor: "left", stroke: "red", strokeWidth: 4}),
+  Plot.frame({anchor: "right", stroke: "green", strokeWidth: 4}),
+  Plot.frame({anchor: "top", stroke: "blue", strokeWidth: 4}),
+  Plot.frame({anchor: "bottom", stroke: "black", strokeWidth: 4})
+];
+
+export async function frameSides() {
+  return Plot.plot({width: 350, height: 250, margin: 2, marks});
+}
+
+export async function frameSidesXY() {
+  return Plot.plot({width: 350, height: 250, x: {domain: [0, 1]}, y: {domain: [0, 1]}, marks});
+}
+
+export async function frameSidesX() {
+  return Plot.plot({width: 350, height: 250, x: {domain: [0, 1]}, marks});
+}
+
+export async function frameSidesY() {
+  return Plot.plot({width: 350, height: 250, y: {domain: [0, 1]}, marks});
+}

test/output/frameSidesX.svg

@@ -74,7 +74,6 @@ export {default as flareCluster} from "./flare-cluster.js";
 export {default as flareIndent} from "./flare-indent.js";
 export {default as flareTree} from "./flare-tree.js";
 export {default as footballCoverage} from "./football-coverage.js";
-export {default as frameCorners} from "./frame-corners.js";
 export {default as fruitSales} from "./fruit-sales.js";
 export {default as fruitSalesDate} from "./fruit-sales-date.js";
 export {default as gistempAnomaly} from "./gistemp-anomaly.js";
@@ -285,6 +284,7 @@ export * from "./axis-labels.js";
 export * from "./bin-1m.js";
 export * from "./electricity-demand.js";
 export * from "./federal-funds.js";
+export * from "./frame.js";
 export * from "./function-contour.js";
 export * from "./heatmap.js";
 export * from "./legend-color.js";