refactor: update object destructuring in all pkgs & examples

thi-ng · Feb 22, 2024 · f36aeb0 · f36aeb0
1 parent 0ab67f0
commit f36aeb0
Show file tree

Hide file tree

Showing 39 changed files with 147 additions and 237 deletions.
diff --git a/examples/devcards/src/index.ts b/examples/devcards/src/index.ts
@@ -117,11 +117,7 @@ function bmi(state: IAtom<BMIState>) {
 	// computes new BMI value (if weight was changed) or
 	// new weight value (if BMI was changed by user)
 	const calc = (updateWeight = false) => {
-		let { height, weight, bmi } = state.deref() || {
-			height: 0,
-			weight: 0,
-			bmi: 0,
-		};
+		let { height = 0, weight = 0, bmi = 0 } = state.deref();
 		height *= 0.01;
 		if (updateWeight) {
 			state.resetIn(["weight"], bmi * height * height);

diff --git a/examples/related-images/src/layout.ts b/examples/related-images/src/layout.ts
@@ -18,19 +18,13 @@ interface LayoutOpts {
 // and a function to query the final (or current) max height...
 export const columnLayout = (opts: LayoutOpts) => {
 	const {
+		gap = 8,
+		margin = 0,
+		extraHeight = 0,
+		snap = 1,
 		cols,
 		width: totalWidth,
-		gap,
-		margin,
-		extraHeight,
-		snap,
-	} = {
-		gap: 8,
-		margin: 0,
-		extraHeight: 0,
-		snap: 1,
-		...opts,
-	};
+	} = opts;
 	// vector of vertical column offsets
 	const offsets = new Int32Array(cols);
 	// column width

diff --git a/packages/axidraw/src/polyline.ts b/packages/axidraw/src/polyline.ts
@@ -16,14 +16,10 @@ import { DOWN, MOVE, PEN, UP } from "./commands.js";
  */
 export function* polyline(
 	pts: ReadonlyVec[],
-	opts: Partial<PolylineOpts>
+	opts: Partial<PolylineOpts> = {}
 ): IterableIterator<DrawCommand> {
 	if (!pts.length) return;
-	const { speed, delayDown, delayUp, down, onlyGeo } = {
-		speed: 1,
-		onlyGeo: false,
-		...opts,
-	};
+	const { speed = 1, onlyGeo = false, delayDown, delayUp, down } = opts;
 	if (onlyGeo) {
 		for (let p of pts) yield MOVE(p, speed);
 		return;

diff --git a/packages/bench/src/profiler.ts b/packages/bench/src/profiler.ts
@@ -67,12 +67,8 @@ export class Profiler
 	protected _enabled!: boolean;
 	protected _overhead = 0;
 
-	constructor(opts?: Partial<ProfilerOpts>) {
-		const { warmup, enabled } = {
-			warmup: 1e6,
-			enabled: true,
-			...opts,
-		};
+	constructor(opts: Partial<ProfilerOpts> = {}) {
+		const { warmup = 1e6, enabled = true } = opts;
 		this.enable();
 		if (warmup > 0) this.warmup(warmup);
 		enabled ? this.reset() : this.disable();

diff --git a/packages/cellular/src/1d.ts b/packages/cellular/src/1d.ts
@@ -348,11 +348,14 @@ export class MultiCA1D implements IClear {
 			pixels.length >= this.width * height,
 			"target pixel buffer too small"
 		);
-		const { cells, mask, prob, probabilistic, rnd, onupdate } = {
-			probabilistic: false,
-			rnd: SYSTEM,
-			...opts,
-		};
+		const {
+			probabilistic = false,
+			rnd = SYSTEM,
+			cells,
+			mask,
+			prob,
+			onupdate,
+		} = opts;
 		const $ = (id: Target, conf?: Partial<UpdateBufferOpts>) => {
 			conf &&
 				conf.perturb &&

diff --git a/packages/colored-noise/src/blue.ts b/packages/colored-noise/src/blue.ts
@@ -7,10 +7,7 @@ import { preseed, sum } from "./utils.js";
  * @param opts -
  */
 export function* blue(opts?: Partial<ColoredNoiseOpts>) {
-	const { bins, scale, rnd } = {
-		...DEFAULT_OPTS,
-		...opts,
-	};
+	const { bins, scale, rnd } = { ...DEFAULT_OPTS, ...opts };
 	const state = preseed(bins, scale, rnd);
 	state.forEach((x, i) => (state[i] = i & 1 ? x : -x));
 	const invN = 1 / bins;

diff --git a/packages/colored-noise/src/pink.ts b/packages/colored-noise/src/pink.ts
@@ -17,11 +17,7 @@ import { preseed, sum } from "./utils.js";
  * @param opts -
  */
 export function* pink(opts?: Partial<ColoredNoiseOpts>) {
-	const { bins, scale, rnd } = {
-		...DEFAULT_OPTS,
-		bins: 8,
-		...opts,
-	};
+	const { bins = 8, scale, rnd } = { ...DEFAULT_OPTS, ...opts };
 	const state = preseed(bins, scale, rnd);
 	const invN = 1 / bins;
 	let acc = sum(state);

diff --git a/packages/colored-noise/src/red.ts b/packages/colored-noise/src/red.ts
@@ -7,10 +7,7 @@ import { preseed, sum } from "./utils.js";
  * @param opts -
  */
 export function* red(opts?: Partial<ColoredNoiseOpts>) {
-	const { bins, scale, rnd } = {
-		...DEFAULT_OPTS,
-		...opts,
-	};
+	const { bins, scale, rnd } = { ...DEFAULT_OPTS, ...opts };
 	const state = preseed(bins, scale, rnd);
 	const invN = 1 / bins;
 	let acc = sum(state);

diff --git a/packages/csv/src/format.ts b/packages/csv/src/format.ts
@@ -19,18 +19,13 @@ export function formatCSV(
 	src: Iterable<CSVRow | CSVRecord>
 ): IterableIterator<string>;
 export function formatCSV(
-	opts?: Partial<CSVFormatOpts>,
+	opts: Partial<CSVFormatOpts> = {},
 	src?: Iterable<CSVRow | CSVRecord>
 ): any {
 	return isIterable(src)
 		? iterator(formatCSV(opts), src)
 		: (rfn: Reducer<any, string>) => {
-				let { header, cols, delim, quote } = {
-					delim: ",",
-					quote: `"`,
-					cols: [],
-					...opts,
-				};
+				let { cols = [], delim = ",", quote = '"', header } = opts;
 				let colTx: Nullable<Stringer<any>>[];
 				const reQuote = new RegExp(quote, "g");
 				const reduce = rfn[2];

diff --git a/packages/csv/src/parse.ts b/packages/csv/src/parse.ts
@@ -96,8 +96,15 @@ export function parseCSV(opts?: Partial<CSVOpts>, src?: Iterable<string>): any {
 	return isIterable(src)
 		? iterator1(parseCSV(opts), src)
 		: (rfn: Reducer<any, CSVRecord>) => {
-				const { all, cols, delim, quote, comment, trim, header } = {
-					all: true,
+				const {
+					all = true,
+					cols,
+					comment,
+					delim,
+					header,
+					quote,
+					trim,
+				} = {
 					...DEFAULT_OPTS,
 					...opts,
 				};
@@ -207,8 +214,14 @@ export function parseCSVSimple(
 	return isIterable(src)
 		? iterator1(parseCSVSimple(opts), src)
 		: (rfn: Reducer<any, CSVRecord>) => {
-				const { cols, delim, quote, comment, trim, header } = {
-					header: true,
+				const {
+					header = true,
+					cols,
+					comment,
+					delim,
+					quote,
+					trim,
+				} = {
 					...DEFAULT_OPTS,
 					...opts,
 				};

diff --git a/packages/file-io/src/file-chunks.ts b/packages/file-io/src/file-chunks.ts
@@ -42,13 +42,11 @@ export interface FileChunkOpts {
  * @param path
  * @param opts
  */
-export async function* fileChunks(path: string, opts?: Partial<FileChunkOpts>) {
-	let { logger, size, start, end } = {
-		size: 1024,
-		start: 0,
-		end: Infinity,
-		...opts,
-	};
+export async function* fileChunks(
+	path: string,
+	opts: Partial<FileChunkOpts> = {}
+) {
+	let { size = 1024, start = 0, end = Infinity, logger } = opts;
 	logger &&
 		logger.debug(`start reading file chunks (size: 0x${size}): ${path}`);
 	let fd: Nullable<FileHandle> = undefined;

diff --git a/packages/fuzzy-viz/src/strategy.ts b/packages/fuzzy-viz/src/strategy.ts
@@ -106,14 +106,9 @@ export const fuzzySetToSvg =
 		serialize(convertTree(fuzzySetToHiccup(opts)(fn, domain, res)));
 
 export const fuzzySetToAscii =
-	(opts?: Partial<AsciiVizOpts>): InstrumentFn<string> =>
+	(opts: Partial<AsciiVizOpts> = {}): InstrumentFn<string> =>
 	(fn, domain, res) => {
-		const { width, height, empty } = {
-			width: 100,
-			height: 16,
-			empty: ".",
-			...opts,
-		};
+		const { width = 100, height = 16, empty = "." } = opts;
 		const [min, max] = domain;
 		const delta = (max - min) / width;
 		const vals: number[] = [];

diff --git a/packages/fuzzy-viz/src/var.ts b/packages/fuzzy-viz/src/var.ts
@@ -21,21 +21,13 @@ export const varToHiccup = (
 	opts: Partial<VizualizeVarOpts> = {}
 ) => {
 	const {
-		samples,
-		width,
-		height,
-		labels,
-		stroke: strokeFn,
-		fill: fillFn,
-	} = {
-		samples: 200,
-		width: 600,
-		height: 100,
-		labels: true,
-		stroke: (x: number) => `hsl(${(x * 360) | 0},100%,40%)`,
-		fill: (x: number) => `hsla(${(x * 360) | 0},100%,50%,20%)`,
-		...opts,
-	};
+		samples = 200,
+		width = 600,
+		height = 100,
+		labels = true,
+		stroke: strokeFn = (x: number) => `hsl(${(x * 360) | 0},100%,40%)`,
+		fill: fillFn = (x: number) => `hsla(${(x * 360) | 0},100%,50%,20%)`,
+	} = opts;
 	const keys = Object.keys(terms);
 	const dt = (max - min) / samples;
 	const ds = width / samples;

diff --git a/packages/geom-axidraw/src/as-axidraw.ts b/packages/geom-axidraw/src/as-axidraw.ts
@@ -138,10 +138,16 @@ function* __points(
 	opts?: Partial<AsAxiDrawOpts>
 ): IterableIterator<DrawCommand> {
 	if (!pts.length) return;
-	const { clip, delayDown, delayUp, down, skip, speed, sort, interleave } = {
-		sort: pointsByNearestNeighbor(),
-		...__axiAttribs(attribs),
-	};
+	const {
+		sort = pointsByNearestNeighbor(),
+		clip,
+		delayDown,
+		delayUp,
+		down,
+		interleave,
+		skip,
+		speed,
+	} = __axiAttribs(attribs);
 	const clipPts = clip || opts?.clip;
 	if (clipPts) {
 		pts = pts.filter((p) => !!pointInPolygon2(p, clipPts));

diff --git a/packages/geom-trace-bitmap/src/trace.ts b/packages/geom-trace-bitmap/src/trace.ts
@@ -106,13 +106,7 @@ export const traceLines = (
 	tx: PointTransform2D,
 	acc: VecPair[] = []
 ) => {
-	let { img, select, clear, last, min, max } = {
-		clear: 0,
-		last: true,
-		min: 2,
-		max: Infinity,
-		...opts,
-	};
+	let { clear = 0, last = true, min = 2, max = Infinity, img, select } = opts;
 	min--;
 	let curr: [number, number][] = [];
 	let prevBorder = false;

diff --git a/packages/grid-iterators/src/utils.ts b/packages/grid-iterators/src/utils.ts
@@ -4,7 +4,7 @@ import type { GridIterOpts2D } from "./api.js";
 import { ident } from "./transforms.js";
 
 export const __opts = (opts: GridIterOpts2D) => {
-	let { cols, rows, tx } = { rows: opts.cols, tx: ident, ...opts };
+	let { cols, rows = opts.cols, tx = ident } = opts;
 	[cols, rows] = asInt(cols, rows);
 	return { cols, rows, tx: tx(cols, rows) };
 };
diff --git a/packages/hiccup-canvas/src/packed-points.ts b/packages/hiccup-canvas/src/packed-points.ts
@@ -23,13 +23,7 @@ const __drawPoints = (
 	cmd: "fill" | "stroke",
 	cmdR: "fillRect" | "strokeRect"
 ) => {
-	const { start, cstride, estride, size } = {
-		start: 0,
-		cstride: 1,
-		estride: 2,
-		size: 1,
-		...opts,
-	};
+	const { start = 0, cstride = 1, estride = 2, size = 1 } = opts;
 	let num =
 		opts && opts.num != null
 			? opts.num

diff --git a/packages/hiccup-canvas/src/polygon.ts b/packages/hiccup-canvas/src/polygon.ts
@@ -60,12 +60,7 @@ export const __drawPackedPoly = (
 	opts: IObjectOf<any>,
 	pts: ArrayLike<number>
 ) => {
-	const { start, cstride, estride } = {
-		start: 0,
-		cstride: 1,
-		estride: 2,
-		...opts,
-	};
+	const { start = 0, cstride = 1, estride = 2 } = opts;
 	let num =
 		opts && opts.num != null
 			? opts.num

diff --git a/packages/msgpack/src/serialize.ts b/packages/msgpack/src/serialize.ts
@@ -22,8 +22,8 @@ const BMAX64 = BigInt("0xffffffffffffffff");
 const MIN64 = Number(BMIN64);
 const MAX64 = Number(BMAX64);
 
-export const serialize = (src: any, opts?: Partial<EncodeOpts>) => {
-	const { initial, resolve } = { initial: 256, ...opts };
+export const serialize = (src: any, opts: Partial<EncodeOpts> = {}) => {
+	const { initial = 256, resolve } = opts;
 	let buf = new Uint8Array(initial);
 	let view = new DataView(buf.buffer);
 	let pos = 0;

diff --git a/packages/oquery/src/match.ts b/packages/oquery/src/match.ts
@@ -93,9 +93,9 @@ export const matchMultiple = <T extends QueryObj = QueryObj, V = any>(
 	key: QueryTerm["q"][0],
 	includes: V[],
 	excludes: V[],
-	opts?: Partial<MatchMultipleOpts<V>>
+	opts: Partial<MatchMultipleOpts<V>> = {}
 ): QueryTerm<T> => {
-	const { union, value: valueFn } = { union: false, ...opts };
+	const { union = false, value: valueFn } = opts;
 	return excludes.length
 		? {
 				q: [

diff --git a/packages/pixel-dither/src/dither.ts b/packages/pixel-dither/src/dither.ts
@@ -14,13 +14,9 @@ import type { DitherKernel, DitherOpts } from "./api.js";
 export const ditherWith = (
 	kernel: DitherKernel,
 	img: IntBuffer,
-	opts?: Partial<DitherOpts>
+	opts: Partial<DitherOpts> = {}
 ) => {
-	const { channels, bleed, threshold } = {
-		bleed: 1,
-		threshold: 0.5,
-		...opts,
-	};
+	const { bleed = 1, threshold = 0.5, channels } = opts;
 	const { format, width, height } = img;
 	const { ox, oy, weights, shift } = kernel;
 	let p: number, err: number;

diff --git a/packages/pixel/src/convolve.ts b/packages/pixel/src/convolve.ts
@@ -113,18 +113,12 @@ const initKernel = (
 /** @internal */
 const initConvolve = (src: FloatBuffer, opts: ConvolveOpts) => {
 	const {
+		channel = 0,
+		offset = 0,
+		scale = 1,
+		stride: sampleStride = 1,
 		kernel,
-		channel,
-		stride: sampleStride,
-		scale,
-		offset,
-	} = {
-		channel: 0,
-		offset: 0,
-		scale: 1,
-		stride: 1,
-		...opts,
-	};
+	} = opts;
 	const size = kernel.size;
 	const [kw, kh] = __asIntVec(size);
 	const [strideX, strideY] = __asIntVec(sampleStride);