From 41d2882857e56d4bda35fc2d6942f6d623d8fdb9 Mon Sep 17 00:00:00 2001
From: Karsten Schmidt <k@thi.ng>
Date: Tue, 5 Mar 2024 20:18:32 +0100
Subject: [PATCH] fix(shader-ast-stdlib): update generics for clamp01(),
 clamp11() and various fitXX() fns

---
 packages/shader-ast-stdlib/src/math/clamp.ts | 14 +++---
 packages/shader-ast-stdlib/src/math/fit.ts   | 48 +++++++++-----------
 2 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/packages/shader-ast-stdlib/src/math/clamp.ts b/packages/shader-ast-stdlib/src/math/clamp.ts
index 3550028737..1f9ca0fefb 100644
--- a/packages/shader-ast-stdlib/src/math/clamp.ts
+++ b/packages/shader-ast-stdlib/src/math/clamp.ts
@@ -1,8 +1,7 @@
 import type {
 	FloatTerm,
-	PrimTerm,
+	Prim,
 	Term,
-	TermType,
 	Vec2Term,
 	Vec3Term,
 	Vec4Term,
@@ -13,14 +12,15 @@ import { clamp } from "@thi.ng/shader-ast/builtin/math";
 
 const __clamp =
 	(min: number, max: number) =>
-	<T extends PrimTerm>(x: T): Term<TermType<T>> =>
+	<T extends Prim>(x: Term<T>): Term<T> =>
 		x.type === F
-			? clamp(<FloatTerm>x, float(min), float(max))
+			? <any>clamp(<FloatTerm>x, float(min), float(max))
 			: x.type === V2
-			? clamp(<Vec2Term>x, vec2(min), vec2(max))
+			? <any>clamp(<Vec2Term>x, vec2(min), vec2(max))
 			: x.type === V3
-			? clamp(<Vec3Term>x, vec3(min), vec3(max))
-			: clamp(<Vec4Term>x, vec4(min), vec4(max));
+			? <any>clamp(<Vec3Term>x, vec3(min), vec3(max))
+			: <any>clamp(<Vec4Term>x, vec4(min), vec4(max));
+
 /**
  * Inline function, expands to equivalent of `clamp(x, 0, 1)`.
  *
diff --git a/packages/shader-ast-stdlib/src/math/fit.ts b/packages/shader-ast-stdlib/src/math/fit.ts
index 891ad454d6..47b77e45a4 100644
--- a/packages/shader-ast-stdlib/src/math/fit.ts
+++ b/packages/shader-ast-stdlib/src/math/fit.ts
@@ -1,4 +1,4 @@
-import type { PrimTerm, Term, TermType } from "@thi.ng/shader-ast";
+import type { Prim, PrimTerm, Term, TermType } from "@thi.ng/shader-ast";
 import { F } from "@thi.ng/shader-ast/api/types";
 import { ternary } from "@thi.ng/shader-ast/ast/controlflow";
 import { defn, ret } from "@thi.ng/shader-ast/ast/function";
@@ -27,13 +27,9 @@ export const fitNorm1 = defn(F, "fitNorm1", [F, F, F], (x, a, b) => [
  * @param x
  * @param a
  * @param b
- * @returns
  */
-export const fitNorm = <T extends PrimTerm>(
-	x: T,
-	a: T,
-	b: T
-): Term<TermType<T>> => div(sub(x, a), sub(b, a));
+export const fitNorm = <T extends Prim>(x: Term<T>, a: Term<T>, b: Term<T>) =>
+	div(sub(x, a), sub(b, a));
 
 /**
  * Fits value `x` from closed interval [a,b] to closed interval [c,d]. No
@@ -45,13 +41,13 @@ export const fitNorm = <T extends PrimTerm>(
  * @param c -
  * @param d -
  */
-export const fit = <T extends PrimTerm>(
-	x: T,
-	a: T,
-	b: T,
-	c: T,
-	d: T
-): Term<TermType<T>> => mix(c, d, fitNorm(x, a, b));
+export const fit = <T extends Prim>(
+	x: Term<T>,
+	a: Term<T>,
+	b: Term<T>,
+	c: Term<T>,
+	d: Term<T>
+) => mix(c, d, fitNorm(x, a, b));
 
 /**
  * Same as {@link fit}, but first clamps `x` to closed [a,b] interval.
@@ -62,13 +58,13 @@ export const fit = <T extends PrimTerm>(
  * @param c -
  * @param d -
  */
-export const fitClamped = <T extends PrimTerm>(
-	x: T,
-	a: T,
-	b: T,
-	c: T,
-	d: T
-): Term<TermType<T>> => mix(c, d, clamp01(div(sub(x, a), sub(b, a))));
+export const fitClamped = <T extends Prim>(
+	x: Term<T>,
+	a: Term<T>,
+	b: Term<T>,
+	c: Term<T>,
+	d: Term<T>
+) => mix(c, d, clamp01(div(sub(x, a), sub(b, a))));
 
 /**
  * Inline function. Fits value `a` in [0..1] interval to new interval
@@ -78,11 +74,11 @@ export const fitClamped = <T extends PrimTerm>(
  * @param b -
  * @param c -
  */
-export const fit01 = <T extends PrimTerm>(
-	a: T,
-	b: T,
-	c: T
-): Term<TermType<T>> => mix(b, c, a);
+export const fit01 = <T extends Prim>(
+	a: Term<T>,
+	b: Term<T>,
+	c: Term<T>
+): Term<T> => mix(b, c, a);
 
 /**
  * Inline function. Fits value `x` in [-1..+1] interval to [0..1]