refactor: add explicit type casts (TS5.6.2)

thi-ng · Oct 5, 2024 · dcbdd60 · dcbdd60
1 parent 11ae480
commit dcbdd60
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 11 deletions.
diff --git a/packages/blurhash/src/encode.ts b/packages/blurhash/src/encode.ts
@@ -95,9 +95,12 @@ export const encodeFromCanvas = (
 ) => {
 	return encode(
 		new Uint32Array(
-			canvas
-				.getContext("2d")!
-				.getImageData(0, 0, canvas.width, canvas.height).data.buffer
+			(<CanvasImageData>canvas.getContext("2d")).getImageData(
+				0,
+				0,
+				canvas.width,
+				canvas.height
+			).data.buffer
 		),
 		canvas.width,
 		canvas.height,

diff --git a/packages/geom/src/scatter.ts b/packages/geom/src/scatter.ts
@@ -1,7 +1,8 @@
-import type { IShape } from "./api.js";
+import type { IRandom } from "@thi.ng/random";
 import { SYSTEM } from "@thi.ng/random/system";
 import type { Vec } from "@thi.ng/vectors";
 import { randMinMax } from "@thi.ng/vectors/rand-minmax";
+import type { IShape } from "./api.js";
 import { bounds } from "./bounds.js";
 import { pointInside } from "./point-inside.js";
 
@@ -23,7 +24,7 @@ import { pointInside } from "./point-inside.js";
 export const scatter = (
 	shape: IShape,
 	num: number,
-	rnd = SYSTEM,
+	rnd: IRandom = SYSTEM,
 	out: Vec[] = []
 ) => {
 	const b = bounds(shape);

diff --git a/packages/k-means/src/kmeans.ts b/packages/k-means/src/kmeans.ts
@@ -2,6 +2,7 @@ import type { IDistance } from "@thi.ng/distance";
 import { argmin } from "@thi.ng/distance/argmin";
 import { DIST_SQ } from "@thi.ng/distance/squared";
 import { assert } from "@thi.ng/errors/assert";
+import type { IRandom } from "@thi.ng/random";
 import { SYSTEM } from "@thi.ng/random/system";
 import { weightedRandom } from "@thi.ng/random/weighted-random";
 import type { ReadonlyVec, Vec } from "@thi.ng/vectors";
@@ -84,7 +85,7 @@ export const initKmeanspp = <T extends ReadonlyVec>(
 	k: number,
 	samples: T[],
 	dist: IDistance<ReadonlyVec> = DIST_SQ,
-	rnd = SYSTEM
+	rnd: IRandom = SYSTEM
 ) => {
 	const num = samples.length;
 	assert(num > 0, `missing samples`);

diff --git a/packages/pixel/src/canvas.ts b/packages/pixel/src/canvas.ts
@@ -31,7 +31,8 @@ export function canvasPixels(
 		ctx = c.ctx;
 	} else {
 		canvas = width;
-		ctx = canvas.getContext("2d")!;
+		// TODO remove cast again - temp workaround for TS5.6.2?
+		ctx = <any>canvas.getContext("2d");
 	}
 	if (parent && canvas instanceof HTMLCanvasElement)
 		parent.appendChild(canvas);

diff --git a/packages/pixel/src/internal/utils.ts b/packages/pixel/src/internal/utils.ts
@@ -152,7 +152,9 @@ export const __blitCanvas = (
 		| OffscreenCanvasRenderingContext2D,
 	opts: Partial<BlitCanvasOpts> = {}
 ) =>
-	(canvas instanceof HTMLCanvasElement || canvas instanceof OffscreenCanvas
-		? canvas.getContext("2d")!
-		: canvas
-	).putImageData(buf.toImageData(opts.data), opts.x || 0, opts.y || 0);
+	(<CanvasImageData>(
+		(canvas instanceof HTMLCanvasElement ||
+		canvas instanceof OffscreenCanvas
+			? canvas.getContext("2d")!
+			: canvas)
+	)).putImageData(buf.toImageData(opts.data), opts.x || 0, opts.y || 0);