From f32b77e92caf62f8283085680663d09b49d9b93a Mon Sep 17 00:00:00 2001
From: Mike Bostock <mbostock@gmail.com>
Date: Fri, 3 Mar 2023 20:56:55 -0800
Subject: [PATCH] inline destructuring

---
 src/transforms/basic.js | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/transforms/basic.js b/src/transforms/basic.js
index 1290edb183..bc8a1c3755 100644
--- a/src/transforms/basic.js
+++ b/src/transforms/basic.js
@@ -3,8 +3,7 @@ import {ascendingDefined, descendingDefined} from "../defined.js";
 import {arrayify, isDomainSort, isOptions, maybeValue, valueof} from "../options.js";
 
 /** @jsdoc transform */
-export function basic(options = {}, transform) {
-  let {filter: f1, sort: s1, reverse: r1, transform: t1, initializer: i1, ...remainingOptions} = options;
+export function basic({filter: f1, sort: s1, reverse: r1, transform: t1, initializer: i1, ...options} = {}, transform) {
   // If both t1 and t2 are defined, returns a composite transform that first
   // applies t1 and then applies t2.
   if (t1 === undefined) {
@@ -15,15 +14,14 @@ export function basic(options = {}, transform) {
   }
   if (transform != null && i1 != null) throw new Error("transforms cannot be applied after initializers");
   return {
-    ...remainingOptions,
+    ...options,
     ...((s1 === null || isDomainSort(s1)) && {sort: s1}),
     transform: composeTransform(t1, transform)
   };
 }
 
 /** @jsdoc initializer */
-export function initializer(options = {}, initializer) {
-  let {filter: f1, sort: s1, reverse: r1, initializer: i1, ...remainingOptions} = options;
+export function initializer({filter: f1, sort: s1, reverse: r1, initializer: i1, ...options} = {}, initializer) {
   // If both i1 and i2 are defined, returns a composite initializer that first
   // applies i1 and then applies i2.
   if (i1 === undefined) {
@@ -33,7 +31,7 @@ export function initializer(options = {}, initializer) {
     if (r1) i1 = composeInitializer(i1, reverseTransform);
   }
   return {
-    ...remainingOptions,
+    ...options,
     ...((s1 === null || isDomainSort(s1)) && {sort: s1}),
     initializer: composeInitializer(i1, initializer)
   };