simpler maybeIdentity

Author: mbostock

src/options.js

@@ -214,18 +214,18 @@ export function slice(values, type = Array) {
 }
 
 // Returns true if any of x, x1, or x2 is not (strictly) undefined.
-export function hasX({x, x1, x2}) {
-  return x !== undefined || x1 !== undefined || x2 !== undefined;
+export function hasX(options) {
+  return options?.x !== undefined || options?.x1 !== undefined || options?.x2 !== undefined;
 }
 
 // Returns true if any of y, y1, or y2 is not (strictly) undefined.
-export function hasY({y, y1, y2}) {
-  return y !== undefined || y1 !== undefined || y2 !== undefined;
+export function hasY(options) {
+  return options?.y !== undefined || options?.y1 !== undefined || options?.y2 !== undefined;
 }
 
 // Returns true if has x or y, or if interval is not (strictly) undefined.
 export function hasXY(options) {
-  return hasX(options) || hasY(options) || options.interval !== undefined;
+  return hasX(options) || hasY(options) || options?.interval !== undefined;
 }
 
 // Disambiguates an options object (e.g., {y: "x2"}) from a primitive value.

src/transforms/identity.js

@@ -1,9 +1,9 @@
 import {hasX, hasY, identity} from "../options.js";
 
-export function maybeIdentityX(options = {}, k = "x") {
-  return hasX(options) ? options : {...options, [k]: identity};
+export function maybeIdentityX(options) {
+  return hasX(options) ? options : {...options, x: identity};
 }
 
-export function maybeIdentityY(options = {}, k = "y") {
-  return hasY(options) ? options : {...options, [k]: identity};
+export function maybeIdentityY(options) {
+  return hasY(options) ? options : {...options, y: identity};
 }