exposeProjection (the old exposeProjection is renamed to prepareProjection)

Author: Fil

src/projection.js

@@ -38,7 +38,7 @@ export function createProjection(
   dimensions
 ) {
   if (projection == null) return;
-  if (typeof projection.stream === "function") return exposeProjection(projection); // projection implementation
+  if (typeof projection.stream === "function") return prepareProjection(projection); // projection implementation
   let options;
   let domain;
   let clip = "frame";
@@ -114,7 +114,7 @@ export function createProjection(
   };
 }
 
-function exposeProjection(projection) {
+function prepareProjection(projection) {
   return typeof projection === "function"
     ? {
         stream: (s) => projection.stream(s),

src/scales.js

@@ -10,7 +10,8 @@ import {
   coerceDates
 } from "./options.js";
 import {orderof} from "./order.js";
-import {createProjection, projectionAspectRatio} from "./projection.js";
+import {createDimensions} from "./dimensions.js";
+import {createProjection} from "./projection.js";
 import {registry, color, position, radius, opacity, symbol, length} from "./scales/index.js";
 import {
   createScaleLinear,
@@ -527,24 +528,15 @@ export function scale(options = {}) {
     if (!registry.has(key)) continue; // ignore unknown properties
     if (!isScaleOptions(options[key])) continue; // e.g., ignore {color: "red"}
     if (scale !== undefined) throw new Error("ambiguous scale definition; multiple scales found");
-    scale = key === "projection" ? scaleProjection(options[key]) : exposeScale(normalizeScale(key, options[key]));
+    scale = key === "projection" ? exposeProjection(options[key]) : exposeScale(normalizeScale(key, options[key]));
   }
   if (scale === undefined) throw new Error("invalid scale definition; no scale found");
   return scale;
 }
 
-function scaleProjection({
-  width = 640,
-  height,
-  margin = 0,
-  marginTop = margin,
-  marginRight = margin,
-  marginBottom = margin,
-  marginLeft = margin,
-  ...projection
-}) {
-  if (height === undefined) height = width * projectionAspectRatio(projection);
-  const p = createProjection({projection}, {width, height, marginTop, marginRight, marginBottom, marginLeft});
+function exposeProjection({width, height, margin, marginTop, marginRight, marginBottom, marginLeft, ...projection}) {
+  const dimensions = createDimensions({}, [], {projection, width, height, margin, marginTop, marginRight, marginBottom, marginLeft}); // prettier-ignore
+  const p = createProjection({projection}, dimensions);
   if (p === undefined) throw new Error("invalid scale definition; unknown projection");
   return p;
 }